HG Plugin (Mercurial)/en: Unterschied zwischen den Versionen
Alkurz (Diskussion | Beiträge) Die Seite wurde neu angelegt: „The plugin provides Mercurial functionality for test suites. A general description of the functionality and commands of HG / Mercurial can be found for examp…“ |
Cg (Diskussion | Beiträge) |
||
| (8 dazwischenliegende Versionen von einem anderen Benutzer werden nicht angezeigt) | |||
| Zeile 1: | Zeile 1: | ||
== Introduction == |
|||
The plugin provides Mercurial functionality for test suites. |
|||
The plugin provides the necessary commands for managing a test-suite via HG / Mercurial. Bookmarks, branches and heads can be used. |
|||
A general description of the functionality and commands of HG / Mercurial can be found for example on [https://www.mercurial-scm.org/wiki/ https://www.mercurial-scm.org/wiki/] |
|||
To see which HG commands are sent, they can be output on the Transcript window. |
|||
== Initialization == |
|||
The plugin provides the necessary commands for managing a test-suite via HG / Mercurial. Bookmarks, branches and heads can be used. |
|||
=== Clone === |
|||
Below is a brief description of each command: |
|||
Initialization |
|||
Clone |
|||
Clone a repository to a new local directory. |
Clone a repository to a new local directory. |
||
The URL of the repository and the location of the local directory are requested. |
The URL of the repository and the location of the local directory are requested. |
||
Add and Commit |
== Add and Commit == |
||
Add File |
=== Add File === |
||
Adds the test-suite to the next version |
Adds the test-suite to the next version |
||
hg add |
hg add <testsuite> |
||
Commit... |
=== Commit... === |
||
Commit the test-suite |
Commit the test-suite |
||
hg commit |
hg commit |
||
Commit (amend)... |
=== Commit (amend)... === |
||
Amend the parent of the working directory |
Amend the parent of the working directory |
||
hg commit --amend |
hg commit --amend |
||
Rollback Last Commit |
=== Rollback Last Commit === |
||
roll back the last transaction (DANGEROUS). This command should be used with care. There is only one level of rollback, and there is no way to undo a rollback. |
roll back the last transaction (DANGEROUS). This command should be used with care. There is only one level of rollback, and there is no way to undo a rollback. |
||
hg rollback |
hg rollback |
||
Revert |
=== Revert Changes === |
||
Restore Testsuite to its checkout state |
|||
hg revert |
hg revert <testsuite> |
||
- |
|||
== Branches == |
|||
Create Local Branch... |
|||
Branch names are permanent and global. Create a light-weight bookmark instead |
|||
Delete Local Branch... |
|||
Checkout Branch... |
|||
=== Create Local Branch... === |
|||
- |
|||
Create |
Create a new branch |
||
hg branch <new branch name> |
|||
Delete Bookmark... |
|||
Move Bookmark... |
|||
=== Checkout Branch... === |
|||
Push Bookmark... |
|||
Set the current branch |
|||
Checkout Bookmark... |
|||
hg branch <branch name> |
|||
Show Bookmarks |
|||
- |
|||
== Bookmarks == |
|||
Show Heads |
|||
Checkout Head... |
|||
=== Create Bookmark === |
|||
- |
|||
Create a bookmark at the current position |
|||
Push |
|||
hg bookmark <name> |
|||
Update |
|||
- |
|||
=== Delete Bookmark... === |
|||
Pull |
|||
Delete a bookmark |
|||
Merge |
|||
hg bookmark -d <name> |
|||
Merge Branch... |
|||
Merge Commit |
|||
=== Move Bookmark... === |
|||
Merge Abort after Conflict |
|||
Move a bookmark to the current position |
|||
- |
|||
hg bookmark -f <name> |
|||
Show Commit Log |
|||
Show Log Tree |
|||
=== Push Bookmark... === |
|||
Show Status |
|||
The specified bookmarked revision, its ancestors, and the bookmark will be pushed to the remote repository. |
|||
- |
|||
hg push -B <name> |
|||
Clone Repository... |
|||
=== Checkout Bookmark... === |
|||
Update the repository's working directory to the bookmark |
|||
hg checkout -r <name> |
|||
=== Show Bookmarks === |
|||
List existing bookmarks |
|||
hg bookmarks |
|||
== Heads == |
|||
=== Checkout Head... === |
|||
Update the repository's working directory to the head |
|||
hg checkout -r <head-rev> |
|||
=== Show Heads === |
|||
List all heads or heads of a branch |
|||
== Push / Update == |
|||
=== Push === |
|||
Push changesets/commits from the local repository |
|||
hg push |
|||
=== Update === |
|||
Pull changes and updates the working directory |
|||
hg pull && hg update <current branch> |
|||
== Pull / Merge == |
|||
=== Pull === |
|||
Pull changes |
|||
hg pull |
|||
=== Merge === |
|||
Merge head. |
|||
If there is more than one head, the desired head can be selected in a dialog |
|||
=== Merge Branch... === |
|||
Merge branch. |
|||
If there is more than one head, the desired head can be selected in a dialog. |
|||
=== Merge Commit === |
|||
Commits the merge. Normally done automatically during the merge. |
|||
=== Merge Abort after Conflict === |
|||
Abort the ongoing merge |
|||
hg merge --abort |
|||
== Informations == |
|||
=== Show Commit Log === |
|||
List the commits |
|||
=== Show Log Tree === |
|||
List the commits arranged graphically as tree (number limited to 100) |
|||
hg log -T "{node} {date} {branch} {bookmarks} {desc|firstline} {tags}" -G -l 100 |
|||
=== Show Status === |
|||
Show information with branch, status, phase and unresolved files |
|||
== Troubleshooting == |
|||
=== Log HG commands === |
|||
To see which HG commands are sent, they can be output on the Transcript window. |
|||
You can activate this in the settings:<br> |
|||
"''Extras''" → "''Settings''": "''expecco Settings''" → "''Execution''" → "''Tracing''": Select "''Show External OS Commands on Transcript''". |
|||
Open the Transcript window via "''Extras''" → "''Tools''" → "''Transcript''" in the expecco menu. |
|||
Translated with www.DeepL.com/Translator (free version) |
|||
Aktuelle Version vom 18. Juli 2023, 13:24 Uhr
Introduction
The plugin provides the necessary commands for managing a test-suite via HG / Mercurial. Bookmarks, branches and heads can be used.
A general description of the functionality and commands of HG / Mercurial can be found for example on https://www.mercurial-scm.org/wiki/
Initialization
Clone
Clone a repository to a new local directory. The URL of the repository and the location of the local directory are requested.
Add and Commit
Add File
Adds the test-suite to the next version
hg add <testsuite>
Commit...
Commit the test-suite
hg commit
Commit (amend)...
Amend the parent of the working directory
hg commit --amend
Rollback Last Commit
roll back the last transaction (DANGEROUS). This command should be used with care. There is only one level of rollback, and there is no way to undo a rollback.
hg rollback
Revert Changes
Restore Testsuite to its checkout state
hg revert <testsuite>
Branches
Branch names are permanent and global. Create a light-weight bookmark instead
Create Local Branch...
Create a new branch
hg branch <new branch name>
Checkout Branch...
Set the current branch
hg branch <branch name>
Bookmarks
Create Bookmark
Create a bookmark at the current position
hg bookmark <name>
Delete Bookmark...
Delete a bookmark
hg bookmark -d <name>
Move Bookmark...
Move a bookmark to the current position
hg bookmark -f <name>
Push Bookmark...
The specified bookmarked revision, its ancestors, and the bookmark will be pushed to the remote repository.
hg push -B <name>
Checkout Bookmark...
Update the repository's working directory to the bookmark
hg checkout -r <name>
Show Bookmarks
List existing bookmarks
hg bookmarks
Heads
Checkout Head...
Update the repository's working directory to the head
hg checkout -r <head-rev>
Show Heads
List all heads or heads of a branch
Push / Update
Push
Push changesets/commits from the local repository
hg push
Update
Pull changes and updates the working directory
hg pull && hg update <current branch>
Pull / Merge
Pull
Pull changes
hg pull
Merge
Merge head.
If there is more than one head, the desired head can be selected in a dialog
Merge Branch...
Merge branch.
If there is more than one head, the desired head can be selected in a dialog.
Merge Commit
Commits the merge. Normally done automatically during the merge.
Merge Abort after Conflict
Abort the ongoing merge
hg merge --abort
Informations
Show Commit Log
List the commits
Show Log Tree
List the commits arranged graphically as tree (number limited to 100)
hg log -T "{node} {date} {branch} {bookmarks} {desc|firstline} {tags}" -G -l 100
Show Status
Show information with branch, status, phase and unresolved files
Troubleshooting
Log HG commands
To see which HG commands are sent, they can be output on the Transcript window.
You can activate this in the settings:
"Extras" → "Settings": "expecco Settings" → "Execution" → "Tracing": Select "Show External OS Commands on Transcript".
Open the Transcript window via "Extras" → "Tools" → "Transcript" in the expecco menu.