HG Plugin (Mercurial)/en: Unterschied zwischen den Versionen
Alkurz (Diskussion | Beiträge) K |
Cg (Diskussion | Beiträge) |
||
| (2 dazwischenliegende Versionen von einem anderen Benutzer werden nicht angezeigt) | |||
| Zeile 1: | Zeile 1: | ||
== Introduction == |
== Introduction == |
||
The plugin provides |
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/] |
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/] |
||
| ⚫ | |||
The plugin provides the necessary commands for managing a test-suite via HG / Mercurial. Bookmarks, branches and heads can be used. |
|||
== Initialization == |
== Initialization == |
||
| Zeile 48: | Zeile 44: | ||
Set the current branch |
Set the current branch |
||
hg branch <branch name> |
hg branch <branch name> |
||
== Bookmarks == |
== Bookmarks == |
||
| Zeile 75: | Zeile 70: | ||
List existing bookmarks |
List existing bookmarks |
||
hg bookmarks |
hg bookmarks |
||
== Heads == |
== Heads == |
||
| Zeile 85: | Zeile 79: | ||
=== Show Heads === |
=== Show Heads === |
||
List all heads or heads of a branch |
List all heads or heads of a branch |
||
== Push / Update == |
== Push / Update == |
||
| Zeile 96: | Zeile 89: | ||
Pull changes and updates the working directory |
Pull changes and updates the working directory |
||
hg pull && hg update <current branch> |
hg pull && hg update <current branch> |
||
== Pull / Merge == |
== Pull / Merge == |
||
| Zeile 120: | Zeile 112: | ||
Abort the ongoing merge |
Abort the ongoing merge |
||
hg merge --abort |
hg merge --abort |
||
== Informations == |
== Informations == |
||
| Zeile 133: | Zeile 124: | ||
=== Show Status === |
=== Show Status === |
||
Show information with branch, status, phase and unresolved files |
Show information with branch, status, phase and unresolved files |
||
== Troubleshooting == |
|||
=== Log HG commands === |
|||
| ⚫ | |||
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. |
|||
Aktuelle Version vom 18. Juli 2023, 13:24 Uhr
Inhaltsverzeichnis
Introduction[Bearbeiten]
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[Bearbeiten]
Clone[Bearbeiten]
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[Bearbeiten]
Add File[Bearbeiten]
Adds the test-suite to the next version
hg add <testsuite>
Commit...[Bearbeiten]
Commit the test-suite
hg commit
Commit (amend)...[Bearbeiten]
Amend the parent of the working directory
hg commit --amend
Rollback Last Commit[Bearbeiten]
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[Bearbeiten]
Restore Testsuite to its checkout state
hg revert <testsuite>
Branches[Bearbeiten]
Branch names are permanent and global. Create a light-weight bookmark instead
Create Local Branch...[Bearbeiten]
Create a new branch
hg branch <new branch name>
Checkout Branch...[Bearbeiten]
Set the current branch
hg branch <branch name>
Bookmarks[Bearbeiten]
Create Bookmark[Bearbeiten]
Create a bookmark at the current position
hg bookmark <name>
Delete Bookmark...[Bearbeiten]
Delete a bookmark
hg bookmark -d <name>
Move Bookmark...[Bearbeiten]
Move a bookmark to the current position
hg bookmark -f <name>
Push Bookmark...[Bearbeiten]
The specified bookmarked revision, its ancestors, and the bookmark will be pushed to the remote repository.
hg push -B <name>
Checkout Bookmark...[Bearbeiten]
Update the repository's working directory to the bookmark
hg checkout -r <name>
Show Bookmarks[Bearbeiten]
List existing bookmarks
hg bookmarks
Heads[Bearbeiten]
Checkout Head...[Bearbeiten]
Update the repository's working directory to the head
hg checkout -r <head-rev>
Show Heads[Bearbeiten]
List all heads or heads of a branch
Push / Update[Bearbeiten]
Push[Bearbeiten]
Push changesets/commits from the local repository
hg push
Update[Bearbeiten]
Pull changes and updates the working directory
hg pull && hg update <current branch>
Pull / Merge[Bearbeiten]
Pull[Bearbeiten]
Pull changes
hg pull
Merge[Bearbeiten]
Merge head.
If there is more than one head, the desired head can be selected in a dialog
Merge Branch...[Bearbeiten]
Merge branch.
If there is more than one head, the desired head can be selected in a dialog.
Merge Commit[Bearbeiten]
Commits the merge. Normally done automatically during the merge.
Merge Abort after Conflict[Bearbeiten]
Abort the ongoing merge
hg merge --abort
Informations[Bearbeiten]
Show Commit Log[Bearbeiten]
List the commits
Show Log Tree[Bearbeiten]
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[Bearbeiten]
Show information with branch, status, phase and unresolved files
Troubleshooting[Bearbeiten]
Log HG commands[Bearbeiten]
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.
