| stash |
| Restricted Project |
rt
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | scripts/scm-prompt.sh (6 lines) | |||
| M | tests/test-scm-prompt-hg.t (4 lines) |
| local remote="$hg/remotenames" | local remote="$hg/remotenames" | ||||
| if [[ -f "$remote" ]]; then | if [[ -f "$remote" ]]; then | ||||
| local allremotemarks="$(command grep "^$dirstate bookmarks" "$remote" | \ | local allremotemarks="$(command grep "^$dirstate bookmarks" "$remote" | \ | ||||
| command cut -f 3 -d ' ')" | command cut -f 3 -d ' ')" | ||||
| if [[ -n "$allremotemarks" ]]; then | if [[ -n "$allremotemarks" ]]; then | ||||
| local remotemark="$(_find_most_relevant "$allremotemarks")" | local remotemark="$(_find_most_relevant "$allremotemarks")" | ||||
| if [[ -n "$remotemark" ]]; then | if [[ -n "$remotemark" ]]; then | ||||
| br="$br|${remotemark}..." | br="$br|$remotemark" | ||||
| if [[ "$remotemark" != "$allremotemarks" ]]; then | |||||
| # if there is more than one, let the user know with an elipsis | |||||
| br="${br}..." | |||||
| fi | |||||
| fi | fi | ||||
| fi | fi | ||||
| fi | fi | ||||
| local branch | local branch | ||||
| if [[ -f "$hg/branch" ]]; then | if [[ -f "$hg/branch" ]]; then | ||||
| branch=$(command cat "$hg/branch") | branch=$(command cat "$hg/branch") | ||||
| if [[ $branch != "default" ]]; then | if [[ $branch != "default" ]]; then | ||||
| br="$br|$branch" | br="$br|$branch" | ||||
| (rebase|UPDATE_NEEDED) | (rebase|UPDATE_NEEDED) | ||||
| $ hg up -q . | $ hg up -q . | ||||
| Test remotenames | Test remotenames | ||||
| $ hg log -r . -T '{node}\n' | $ hg log -r . -T '{node}\n' | ||||
| 4b6cc7d5194bd5dbf63970015ec75f8fd1de6dba | 4b6cc7d5194bd5dbf63970015ec75f8fd1de6dba | ||||
| $ echo 4b6cc7d5194bd5dbf63970015ec75f8fd1de6dba bookmarks remote/@ > .hg/remotenames | $ echo 4b6cc7d5194bd5dbf63970015ec75f8fd1de6dba bookmarks remote/@ > .hg/remotenames | ||||
| $ cmd | $ cmd | ||||
| (4b6cc7d|remote/@...) | (4b6cc7d|remote/@) | ||||
| Test shared bookmarks | Test shared bookmarks | ||||
| $ cmd cd .. | $ cmd cd .. | ||||
| $ cmd hg share -B repo share --config "extensions.share=" | $ cmd hg share -B repo share --config "extensions.share=" | ||||
| updating working directory | updating working directory | ||||
| 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ cmd cd share | $ cmd cd share | ||||
| (42eaf5c) | (42eaf5c) | ||||
| $ cmd | $ cmd | ||||
| (unshared|UPDATE_NEEDED) | (unshared|UPDATE_NEEDED) | ||||
| $ cd ../repo | $ cd ../repo | ||||
| Test branches | Test branches | ||||
| $ cmd hg branch blah | $ cmd hg branch blah | ||||
| marked working directory as branch blah | marked working directory as branch blah | ||||
| (branches are permanent and global, did you want a bookmark?) | (branches are permanent and global, did you want a bookmark?) | ||||
| (4b6cc7d|remote/@...|blah) | (4b6cc7d|remote/@|blah) | ||||
| $ cmd hg commit -m blah | $ cmd hg commit -m blah | ||||
| (a742469|blah) | (a742469|blah) | ||||
| $ cmd hg up -q default | $ cmd hg up -q default | ||||
| (42eaf5c) | (42eaf5c) | ||||
| $ cmd hg up -q | $ cmd hg up -q | ||||
| (42eaf5c) | (42eaf5c) | ||||
| Test branches with bookmarks and other stuff | Test branches with bookmarks and other stuff | ||||