mirror of
https://github.com/facebook/sapling.git
synced 2024-12-26 14:34:34 +03:00
tags: remove tip tag
Summary: In a future diff we'll be removing tags. The most prevalent tag is 'tip', which shows up in a ton of test output. Let's drop that tag first, so we can safely update the tests before we drop tags entirely. Reviewed By: xavierd Differential Revision: D18995058 fbshipit-source-id: 8c63710cd4ed567ea24e32724b8660f9006a61f1
This commit is contained in:
Durham Goode
Facebook Github Bot
parent
e1c73204f6
commit
218c83d574
@ -1109,7 +1109,6 @@ class localrepository(object):
|
||||
for (name, (node, hist)) in alltags.iteritems():
|
||||
if node != nullid:
|
||||
tags[encoding.tolocal(name)] = node
|
||||
tags["tip"] = self.changelog.tip()
|
||||
tagtypes = dict(
|
||||
[(encoding.tolocal(name), value) for (name, value) in tagtypes.iteritems()]
|
||||
)
|
||||
|
||||
@ -9,7 +9,6 @@
|
||||
"""Create a Mercurial repository in revlog format 0
|
||||
|
||||
changeset: 0:a1ef0b125355
|
||||
tag: tip
|
||||
user: user
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
files: empty
|
||||
|
||||
@ -84,7 +84,6 @@ should fail
|
||||
|
||||
$ hg log -r "heads(. or wdir() & file('**'))"
|
||||
changeset: 0:* (glob)
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: 0
|
||||
|
||||
@ -12,7 +12,7 @@ Alias can override a builtin command to another builtin command.
|
||||
$ newrepo
|
||||
$ setconfig alias.log=id
|
||||
$ hg log -r null
|
||||
000000000000 tip
|
||||
000000000000
|
||||
|
||||
Alias can refer to another alias. Order does not matter.
|
||||
|
||||
|
||||
@ -491,7 +491,6 @@ interaction with defaults
|
||||
|
||||
$ hg mylog
|
||||
changeset: 0:e63c23eaa88a
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: foo
|
||||
@ -587,13 +586,13 @@ shadowing
|
||||
(use 'hg help' to get help)
|
||||
[255]
|
||||
$ hg id
|
||||
c0c7cf58edc5 tip
|
||||
c0c7cf58edc5
|
||||
$ hg ida
|
||||
unknown command 'ida'
|
||||
(use 'hg help' to get help)
|
||||
[255]
|
||||
$ hg idalias
|
||||
c0c7cf58edc5 tip
|
||||
c0c7cf58edc5
|
||||
$ hg idaliasl
|
||||
unknown command 'idaliasl'
|
||||
(use 'hg help' to get help)
|
||||
@ -743,7 +742,7 @@ invalid global arguments for normal commands, aliases, and shell aliases
|
||||
This should show id:
|
||||
|
||||
$ hg --config alias.log='id' log
|
||||
000000000000 tip
|
||||
000000000000
|
||||
|
||||
This shouldn't:
|
||||
|
||||
|
||||
@ -123,7 +123,7 @@ The "prune" cases.
|
||||
$ hg rebase --restack
|
||||
rebasing 112478962961 "B"
|
||||
rebasing f585351a92f8 "D"
|
||||
rebasing 78d2dca436b2 "E" (tip)
|
||||
rebasing 78d2dca436b2 "E"
|
||||
|
||||
$ hg update -q $H
|
||||
$ hg rebase --restack
|
||||
@ -171,7 +171,7 @@ Restack could resume after resolving merge conflicts.
|
||||
continue: hg rebase --continue
|
||||
$ hg rebase --continue
|
||||
rebasing ed8545a5c22a "F"
|
||||
rebasing 4d1ef7d890c5 "G" (tip)
|
||||
rebasing 4d1ef7d890c5 "G"
|
||||
merging E
|
||||
warning: 1 conflicts while merging E! (edit, then use 'hg resolve --mark')
|
||||
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
||||
|
||||
@ -329,7 +329,7 @@ sh % "showgraph" == r"""
|
||||
|/
|
||||
o 0 1f0dee641bb7 add a"""
|
||||
sh % "hg rebase --restack" == r'''
|
||||
rebasing dd2a887139a3 "add c" (tip)
|
||||
rebasing dd2a887139a3 "add c"
|
||||
rebasing 47d2a3944de8 "add d"'''
|
||||
sh % "showgraph" == r"""
|
||||
@ 7 4e2bc7d6cfea add d
|
||||
@ -455,7 +455,7 @@ sh % "showgraph" == r"""
|
||||
|/
|
||||
o 0 1f0dee641bb7 add a"""
|
||||
sh % "hg rebase --restack" == r"""
|
||||
rebasing dd2a887139a3 "add c" (tip)
|
||||
rebasing dd2a887139a3 "add c"
|
||||
rebasing 47d2a3944de8 "add d"
|
||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved"""
|
||||
sh % "showgraph" == r"""
|
||||
@ -532,7 +532,7 @@ sh % "showgraph" == r"""
|
||||
sh % "hg rebase --restack" == r"""
|
||||
rebasing 849d5cce0019 "add f"
|
||||
rebasing dd2a887139a3 "add c"
|
||||
rebasing 8282a17a7483 "add g" (tip)
|
||||
rebasing 8282a17a7483 "add g"
|
||||
rebasing 47d2a3944de8 "add d"
|
||||
rebasing e86422ad5d0e "add h"
|
||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved"""
|
||||
|
||||
@ -175,7 +175,7 @@ and the rebase should fail (issue5628)
|
||||
|
||||
$ hg up -qC 2
|
||||
$ hg rebase -s 2 -d 1 --config extensions.rebase=
|
||||
rebasing e73c21d6b244 "file a/poisoned" (tip)
|
||||
rebasing e73c21d6b244 "file a/poisoned"
|
||||
abort: path 'a/poisoned' traverses symbolic link 'a'
|
||||
[255]
|
||||
$ ls ../merge-symlink-out
|
||||
|
||||
@ -44,7 +44,7 @@ specified explicitly)
|
||||
$ cat a
|
||||
a
|
||||
$ hg summary
|
||||
parent: 2:8540552e2ce9 tip
|
||||
parent: 2:8540552e2ce9
|
||||
Back out "b"
|
||||
commit: (clean)
|
||||
phases: 3 draft
|
||||
@ -70,7 +70,7 @@ commit option
|
||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
changeset 3:6b2e5750efab backs out changeset 1:22cb4f70d813
|
||||
$ hg summary
|
||||
parent: 3:6b2e5750efab tip
|
||||
parent: 3:6b2e5750efab
|
||||
Back out "chair"
|
||||
commit: (clean)
|
||||
phases: 4 draft
|
||||
@ -83,7 +83,7 @@ commit option
|
||||
use 'hg resolve' to retry unresolved file merges
|
||||
[1]
|
||||
$ hg summary
|
||||
parent: 4:2cf19744f63f tip
|
||||
parent: 4:2cf19744f63f
|
||||
ypples
|
||||
commit: 1 unresolved (clean)
|
||||
phases: 5 draft
|
||||
@ -109,7 +109,7 @@ specified explicitly)
|
||||
$ cat a
|
||||
content
|
||||
$ hg summary
|
||||
parent: 2:0ab3c2be0b32 tip
|
||||
parent: 2:0ab3c2be0b32
|
||||
Backed out changeset 76862dcce372
|
||||
commit: (clean)
|
||||
phases: 3 draft
|
||||
@ -122,7 +122,7 @@ backout of backout is as if nothing happened
|
||||
$ test -f a
|
||||
[1]
|
||||
$ hg summary
|
||||
parent: 3:5b1b9b2a0f35 tip
|
||||
parent: 3:5b1b9b2a0f35
|
||||
Back out "Backed out changeset 76862dcce372"
|
||||
commit: (clean)
|
||||
phases: 4 draft
|
||||
@ -183,7 +183,7 @@ should fail
|
||||
$ hg ci -Am2
|
||||
adding c
|
||||
$ hg summary
|
||||
parent: 2:db815d6d32e6 tip
|
||||
parent: 2:db815d6d32e6
|
||||
2
|
||||
commit: (clean)
|
||||
phases: 3 draft
|
||||
@ -194,7 +194,7 @@ should fail
|
||||
abort: cannot backout change that is not an ancestor
|
||||
[255]
|
||||
$ hg summary
|
||||
parent: 2:db815d6d32e6 tip
|
||||
parent: 2:db815d6d32e6
|
||||
2
|
||||
commit: (clean)
|
||||
phases: 3 draft
|
||||
@ -210,7 +210,7 @@ backout with merge
|
||||
$ hg commit -d '0 0' -A -m a
|
||||
adding a
|
||||
$ hg summary
|
||||
parent: 0:59395513a13a tip
|
||||
parent: 0:59395513a13a
|
||||
a
|
||||
commit: (clean)
|
||||
phases: 1 draft
|
||||
@ -232,7 +232,7 @@ remove line 1
|
||||
(branch merge, don't forget to commit)
|
||||
$ hg commit -d '4 0' -m d
|
||||
$ hg summary
|
||||
parent: 4:76e753f52d24 tip
|
||||
parent: 4:76e753f52d24
|
||||
d
|
||||
commit: (clean)
|
||||
phases: 5 draft
|
||||
@ -346,7 +346,7 @@ backout should not back out subsequent changesets
|
||||
$ hg commit -d '2 0' -A -m c
|
||||
adding b
|
||||
$ hg summary
|
||||
parent: 2:882396649954 tip
|
||||
parent: 2:882396649954
|
||||
c
|
||||
commit: (clean)
|
||||
phases: 3 draft
|
||||
@ -362,7 +362,7 @@ without --merge
|
||||
$ hg locate b
|
||||
b
|
||||
$ hg summary
|
||||
parent: 2:882396649954 tip
|
||||
parent: 2:882396649954
|
||||
c
|
||||
commit: (clean)
|
||||
phases: 3 draft
|
||||
@ -403,7 +403,7 @@ with --merge
|
||||
(branch merge, don't forget to commit)
|
||||
$ hg commit -d '4 0' -A -m d
|
||||
$ hg summary
|
||||
parent: 4:b2f3bb92043e tip
|
||||
parent: 4:b2f3bb92043e
|
||||
d
|
||||
commit: (clean)
|
||||
phases: 5 draft
|
||||
@ -432,7 +432,7 @@ backout with valid parent should be ok
|
||||
removing d
|
||||
changeset 5:84e16af81ce4 backs out changeset 4:b2f3bb92043e
|
||||
$ hg summary
|
||||
parent: 5:84e16af81ce4 tip
|
||||
parent: 5:84e16af81ce4
|
||||
Back out "d"
|
||||
commit: (clean)
|
||||
phases: 6 draft
|
||||
@ -443,7 +443,7 @@ backout with valid parent should be ok
|
||||
$ hg update -C
|
||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
$ hg summary
|
||||
parent: 4:b2f3bb92043e tip
|
||||
parent: 4:b2f3bb92043e
|
||||
d
|
||||
commit: (clean)
|
||||
phases: 5 draft
|
||||
@ -452,7 +452,7 @@ backout with valid parent should be ok
|
||||
removing c
|
||||
changeset 5:042ecc423244 backs out changeset 4:b2f3bb92043e
|
||||
$ hg summary
|
||||
parent: 5:042ecc423244 tip
|
||||
parent: 5:042ecc423244
|
||||
Back out "d"
|
||||
commit: (clean)
|
||||
phases: 6 draft
|
||||
@ -485,7 +485,7 @@ without --merge
|
||||
C default
|
||||
C file2
|
||||
$ hg summary
|
||||
parent: 2:ce121fd37829 tip
|
||||
parent: 2:ce121fd37829
|
||||
file2
|
||||
bookmarks: branch2
|
||||
commit: 1 removed
|
||||
@ -516,7 +516,7 @@ explicitly regardless of '--message')
|
||||
$ hg summary
|
||||
parent: 2:ce121fd37829
|
||||
file2
|
||||
parent: 3:3ee3eb817232 tip
|
||||
parent: 3:3ee3eb817232
|
||||
backout on branch1
|
||||
bookmarks: branch2
|
||||
commit: 1 removed (merge)
|
||||
@ -545,12 +545,12 @@ on branch2 with branch1 merged, so file1 should be gone:
|
||||
(branch merge, don't forget to commit)
|
||||
$ hg ci -d '4 0' -m 'merge backout of branch1'
|
||||
$ hg id
|
||||
1589644119df tip
|
||||
1589644119df
|
||||
$ hg st -A
|
||||
C default
|
||||
C file2
|
||||
$ hg summary
|
||||
parent: 4:1589644119df tip
|
||||
parent: 4:1589644119df
|
||||
merge backout of branch1
|
||||
commit: (clean)
|
||||
phases: 5 draft
|
||||
@ -661,7 +661,7 @@ Test usage of `hg resolve` in case of conflict
|
||||
$ hg resolve -l # still unresolved
|
||||
U foo
|
||||
$ hg summary
|
||||
parent: 2:b71750c4b0fd tip
|
||||
parent: 2:b71750c4b0fd
|
||||
capital ten
|
||||
commit: 1 unresolved (clean)
|
||||
phases: 3 draft
|
||||
@ -678,7 +678,7 @@ Test usage of `hg resolve` in case of conflict
|
||||
$ hg resolve -l
|
||||
R foo
|
||||
$ hg summary
|
||||
parent: 2:b71750c4b0fd tip
|
||||
parent: 2:b71750c4b0fd
|
||||
capital ten
|
||||
commit: 1 modified, 1 unknown
|
||||
phases: 3 draft
|
||||
|
||||
@ -65,7 +65,6 @@ This command is ancient:
|
||||
|
||||
$ hg history
|
||||
changeset: 0:acb14030fe0a
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: test
|
||||
|
||||
@ -23,7 +23,6 @@ for i in range(32):
|
||||
|
||||
sh % "hg log" == r"""
|
||||
changeset: 31:58c80a7c8a40
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:31 1970 +0000
|
||||
summary: msg 31
|
||||
@ -197,7 +196,7 @@ sh % "hg status -v" == r"""
|
||||
# To abort: hg bisect --reset"""
|
||||
sh % "hg status -v --config 'commands.status.skipstates=bisect'"
|
||||
sh % "hg summary" == r"""
|
||||
parent: 31:58c80a7c8a40 tip
|
||||
parent: 31:58c80a7c8a40
|
||||
msg 31
|
||||
commit: (clean)
|
||||
phases: 32 draft"""
|
||||
@ -574,7 +573,6 @@ sh % "hg bisect --command true" == r"""
|
||||
changeset 29:b5bd63375ab9: good
|
||||
The first bad revision is:
|
||||
changeset: 30:ed2d2f24b11c
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:30 1970 +0000
|
||||
summary: msg 30"""
|
||||
|
||||
@ -128,7 +128,6 @@ log
|
||||
|
||||
$ hg log
|
||||
changeset: 18:d42e18c7bc9b
|
||||
tag: tip
|
||||
parent: 15:857b178a7cf3
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:18 1970 +0000
|
||||
|
||||
@ -121,7 +121,6 @@ test style
|
||||
$ hg log --style bisect
|
||||
changeset: 14:cbf2f3105bbf
|
||||
bisect:
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:14 1970 +0000
|
||||
summary: 14
|
||||
|
||||
@ -112,7 +112,6 @@ we must not cause a failure if we cannot write to the log
|
||||
searching for changes
|
||||
all local heads known remotely
|
||||
changeset: 2:d02f48003e62c24e2659d97d30f2a83abe5d5d51
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 1:6563da9dcf87b1949716e38ff3e3dfaa3198eb06
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
|
||||
@ -132,7 +132,6 @@
|
||||
$ hg heads
|
||||
changeset: 8:04dd21731d95
|
||||
bookmark: g
|
||||
tag: tip
|
||||
parent: 6:be381d1126a0
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
|
||||
@ -40,13 +40,12 @@ bookmark list
|
||||
rebase
|
||||
|
||||
$ hg rebase -s two -d one
|
||||
rebasing 2ae46b1d99a7 "3" (two tip)
|
||||
rebasing 2ae46b1d99a7 "3" (two)
|
||||
saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg
|
||||
|
||||
$ hg log
|
||||
changeset: 3:42e5ed2cdcf4
|
||||
bookmark: two
|
||||
tag: tip
|
||||
parent: 1:925d80f479bb
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -79,7 +78,7 @@ aborted rebase should restore active bookmark.
|
||||
adding d
|
||||
$ hg bookmark three
|
||||
$ hg rebase -s three -d two
|
||||
rebasing dd7c838e8362 "4" (three tip)
|
||||
rebasing dd7c838e8362 "4" (three)
|
||||
merging d
|
||||
warning: 1 conflicts while merging d! (edit, then use 'hg resolve --mark')
|
||||
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
||||
@ -94,7 +93,7 @@ aborted rebase should restore active bookmark.
|
||||
after aborted rebase, restoring a bookmark that has been removed should not fail
|
||||
|
||||
$ hg rebase -s three -d two
|
||||
rebasing dd7c838e8362 "4" (three tip)
|
||||
rebasing dd7c838e8362 "4" (three)
|
||||
merging d
|
||||
warning: 1 conflicts while merging d! (edit, then use 'hg resolve --mark')
|
||||
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
||||
|
||||
@ -51,7 +51,6 @@ look up bookmark
|
||||
$ hg log -r X
|
||||
changeset: 0:f7b1eb17ad24
|
||||
bookmark: X
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: 0
|
||||
@ -111,7 +110,6 @@ bookmarks revset
|
||||
|
||||
changeset: 1:925d80f479bb
|
||||
bookmark: X2
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: 1
|
||||
@ -120,7 +118,6 @@ bookmarks revset
|
||||
$ hg log -r 'bookmark(X2)'
|
||||
changeset: 1:925d80f479bb
|
||||
bookmark: X2
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: 1
|
||||
@ -134,7 +131,6 @@ bookmarks revset
|
||||
|
||||
changeset: 1:925d80f479bb
|
||||
bookmark: X2
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: 1
|
||||
@ -313,7 +309,6 @@ look up stripped bookmark name
|
||||
changeset: 2:db815d6d32e6
|
||||
bookmark: Y
|
||||
bookmark: x y
|
||||
tag: tip
|
||||
parent: 0:f7b1eb17ad24
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -494,7 +489,7 @@ the bookmark extension should be ignored now that it is part of core
|
||||
test summary
|
||||
|
||||
$ hg summary
|
||||
parent: 2:db815d6d32e6 tip
|
||||
parent: 2:db815d6d32e6
|
||||
2
|
||||
bookmarks: *Z Y x y
|
||||
commit: (clean)
|
||||
@ -503,7 +498,7 @@ test summary
|
||||
test id
|
||||
|
||||
$ hg id
|
||||
db815d6d32e6 tip Y/Z/x y
|
||||
db815d6d32e6 Y/Z/x y
|
||||
|
||||
test rollback
|
||||
|
||||
@ -745,7 +740,6 @@ test stripping a non-checked-out but bookmarked revision
|
||||
|
||||
$ hg log --graph
|
||||
@ changeset: 4:9c404beeabc2
|
||||
| tag: tip
|
||||
| parent: 2:db815d6d32e6
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -785,7 +779,6 @@ tipmost surviving ancestor of the stripped revision.
|
||||
@ changeset: 3:9c404beeabc2
|
||||
| bookmark: four
|
||||
| bookmark: should-end-on-two
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: y
|
||||
@ -821,7 +814,7 @@ working directory of current repository)
|
||||
$ hg up
|
||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
$ hg sum
|
||||
parent: 3:9c404beeabc2 tip
|
||||
parent: 3:9c404beeabc2
|
||||
y
|
||||
bookmarks: *four should-end-on-two
|
||||
commit: 2 unknown (clean)
|
||||
@ -962,7 +955,6 @@ ensure changelog is written before bookmarks
|
||||
$ hg log -r .
|
||||
changeset: 0:867bc5792c8c
|
||||
bookmark: mybook
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: one
|
||||
@ -1043,7 +1035,6 @@ add hooks:
|
||||
|
||||
$ hg log -G -T phases
|
||||
@ changeset: 6:81dcce76aa0b
|
||||
| tag: tip
|
||||
| phase: draft
|
||||
| parent: 4:125c9a1d6df6
|
||||
| user: test
|
||||
|
||||
@ -160,7 +160,6 @@ Log -R full.hg in fresh empty
|
||||
$ cd empty
|
||||
$ hg -R ../full.hg log
|
||||
changeset: 8:aa35859c02ea
|
||||
tag: tip
|
||||
parent: 3:eebf5a27f8ca
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -405,7 +404,6 @@ Log -R full.hg in partial
|
||||
|
||||
$ hg -R ../full.hg log -T phases
|
||||
changeset: 8:aa35859c02ea
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 3:eebf5a27f8ca
|
||||
user: test
|
||||
@ -489,7 +487,6 @@ Incoming full.hg in partial
|
||||
summary: 1.3m
|
||||
|
||||
changeset: 8:aa35859c02ea
|
||||
tag: tip
|
||||
parent: 3:eebf5a27f8ca
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -523,7 +520,6 @@ Outgoing -R full.hg vs partial2 in partial
|
||||
summary: 1.3m
|
||||
|
||||
changeset: 8:aa35859c02ea
|
||||
tag: tip
|
||||
parent: 3:eebf5a27f8ca
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -553,7 +549,6 @@ Direct clone from bundle (all-history)
|
||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
$ hg -R full-clone heads
|
||||
changeset: 8:aa35859c02ea
|
||||
tag: tip
|
||||
parent: 3:eebf5a27f8ca
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -650,7 +645,6 @@ test for 540d1059c802
|
||||
comparing with ../bundle.hg
|
||||
searching for changes
|
||||
changeset: 2:ed1b79f46b9a
|
||||
tag: tip
|
||||
parent: 0:bbd179dfa0a7
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -820,7 +814,6 @@ directory does not exist
|
||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
$ hg log -G
|
||||
o changeset: 3:8bd3e1f196af
|
||||
| tag: tip
|
||||
| parent: 1:a01eca7af26d
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
|
||||
@ -486,7 +486,7 @@ Setting up
|
||||
postclose-tip:e7ec4e813ba6 draft
|
||||
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=commit
|
||||
$ hg id
|
||||
e7ec4e813ba6 tip
|
||||
e7ec4e813ba6
|
||||
$ cd ..
|
||||
|
||||
$ cat << EOF >> $HGRCPATH
|
||||
|
||||
@ -40,7 +40,6 @@ this should not mention bar but should mention foo:
|
||||
|
||||
$ hg tip -v
|
||||
changeset: 3:c53d17ff3380
|
||||
tag: tip
|
||||
parent: 2:ed1b79f46b9a
|
||||
parent: 1:d394a8db219b
|
||||
user: test
|
||||
|
||||
@ -92,7 +92,7 @@ Rebase with conflict resolution
|
||||
$ hg rebase --continue
|
||||
rebasing 78930e916793 "2z"
|
||||
commit_info (author=test checkoutidentifier=0000000000000008 mutation=rebase node=2a9f3f40eebf9d189f51eeba40f6d45935255c3e predecessors=78930e916793ff11b38f4f89f92221c180f922a3)
|
||||
rebasing 27fd2733660c "3" (tip)
|
||||
rebasing 27fd2733660c "3"
|
||||
commit_info (author=test checkoutidentifier=0000000000000009 mutation=rebase node=b42c49c8c650d6040d4a4003a30c82e1cde21c50 predecessors=27fd2733660ce0233ef4603cebe6328681aa598d)
|
||||
$ hg debugcheckoutidentifier
|
||||
0000000000000010
|
||||
|
||||
@ -184,7 +184,6 @@ Repo a has two heads:
|
||||
$ hg heads
|
||||
changeset: 15:7b0a8591eda2
|
||||
bookmark: stable
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: another change for branch stable
|
||||
@ -216,7 +215,6 @@ Repo ua has both heads:
|
||||
$ hg -R ua heads
|
||||
changeset: 15:7b0a8591eda2
|
||||
bookmark: stable
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: another change for branch stable
|
||||
@ -254,7 +252,6 @@ Repo ua has both heads:
|
||||
$ hg -R ua heads
|
||||
changeset: 15:7b0a8591eda2
|
||||
bookmark: stable
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: another change for branch stable
|
||||
@ -286,7 +283,6 @@ Repo ua has both heads:
|
||||
$ hg -R ua heads
|
||||
changeset: 15:7b0a8591eda2
|
||||
bookmark: stable
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: another change for branch stable
|
||||
@ -302,7 +298,6 @@ Branch 'stable' is checked out:
|
||||
$ hg -R ua parents
|
||||
changeset: 15:7b0a8591eda2
|
||||
bookmark: stable
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: another change for branch stable
|
||||
@ -322,7 +317,6 @@ Repo ua has both heads:
|
||||
$ hg -R ua heads
|
||||
changeset: 15:7b0a8591eda2
|
||||
bookmark: stable
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: another change for branch stable
|
||||
@ -347,7 +341,6 @@ Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6):
|
||||
$ hg -R ua heads
|
||||
changeset: 15:7b0a8591eda2
|
||||
bookmark: stable
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: another change for branch stable
|
||||
@ -384,7 +377,6 @@ Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6):
|
||||
$ hg -R ua heads
|
||||
changeset: 13:7b0a8591eda2
|
||||
bookmark: stable
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: another change for branch stable
|
||||
@ -416,7 +408,6 @@ Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6):
|
||||
$ hg -R ua heads
|
||||
changeset: 13:7b0a8591eda2
|
||||
bookmark: stable
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: another change for branch stable
|
||||
@ -427,7 +418,6 @@ Branch 'stable' is checked out:
|
||||
$ hg -R ua parents
|
||||
changeset: 13:7b0a8591eda2
|
||||
bookmark: stable
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: another change for branch stable
|
||||
@ -747,7 +737,6 @@ Checked out revision should be head of default branch
|
||||
$ hg -R share-dest1b log -r .
|
||||
changeset: 6:79168763a548
|
||||
bookmark: branch2
|
||||
tag: tip
|
||||
parent: 0:b5f04eac9d8f
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -824,7 +813,6 @@ request to clone a single revision is respected in sharing mode
|
||||
$ hg -R share-1arev log -G
|
||||
@ changeset: 1:4a8dc1ab4c13
|
||||
| bookmark: head1
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: head1
|
||||
@ -852,7 +840,6 @@ making another clone should only pull down requested rev
|
||||
$ hg -R share-1brev log -G
|
||||
@ changeset: 2:99f71071f117
|
||||
| bookmark: head2
|
||||
| tag: tip
|
||||
| parent: 0:b5f04eac9d8f
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -900,7 +887,6 @@ Cloning into pooled storage doesn't race (issue5104)
|
||||
$ hg -R share-destrace1 log -r tip
|
||||
changeset: 2:e5bfe23c0b47
|
||||
bookmark: bookA
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: 1a
|
||||
@ -909,7 +895,6 @@ Cloning into pooled storage doesn't race (issue5104)
|
||||
$ hg -R share-destrace2 log -r tip
|
||||
changeset: 2:e5bfe23c0b47
|
||||
bookmark: bookA
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: 1a
|
||||
|
||||
@ -289,7 +289,6 @@ sh % "echo '__base__ = map-cmdline.default'" > "map-simple"
|
||||
sh % "echo 'cset = \"changeset: ***{rev}***\\n\"'" >> "map-simple"
|
||||
sh % "hg log -l1 -T./map-simple" == r"""
|
||||
changeset: ***8***
|
||||
tag: tip
|
||||
user: test
|
||||
date: Wed Jan 01 10:01:00 2020 +0000
|
||||
summary: third"""
|
||||
@ -348,7 +347,7 @@ sh % "hg tip -v --template '\\n'"
|
||||
# Compact style works:
|
||||
|
||||
sh % "hg log -Tcompact" == r"""
|
||||
8[tip] 95c24699272e 2020-01-01 10:01 +0000 test
|
||||
8 95c24699272e 2020-01-01 10:01 +0000 test
|
||||
third
|
||||
|
||||
7:-1 29114dbae42b 1970-01-12 13:46 +0000 user
|
||||
@ -376,7 +375,7 @@ sh % "hg log -Tcompact" == r"""
|
||||
line 1"""
|
||||
|
||||
sh % "hg log -v --style compact" == r"""
|
||||
8[tip] 95c24699272e 2020-01-01 10:01 +0000 test
|
||||
8 95c24699272e 2020-01-01 10:01 +0000 test
|
||||
third
|
||||
|
||||
7:-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname>
|
||||
@ -408,7 +407,7 @@ sh % "hg log -v --style compact" == r"""
|
||||
line 2"""
|
||||
|
||||
sh % "hg log --debug --style compact" == r"""
|
||||
8[tip]:7,-1 95c24699272e 2020-01-01 10:01 +0000 test
|
||||
8:7,-1 95c24699272e 2020-01-01 10:01 +0000 test
|
||||
third
|
||||
|
||||
7:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname>
|
||||
@ -450,7 +449,6 @@ sh % "hg log --style xml" == r"""
|
||||
<?xml version="1.0"?>
|
||||
<log>
|
||||
<logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
|
||||
<tag>tip</tag>
|
||||
<author email="test">test</author>
|
||||
<date>2020-01-01T10:01:00+00:00</date>
|
||||
<msg xml:space="preserve">third</msg>
|
||||
@ -510,7 +508,6 @@ sh % "hg log -v --style xml" == r"""
|
||||
<?xml version="1.0"?>
|
||||
<log>
|
||||
<logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
|
||||
<tag>tip</tag>
|
||||
<author email="test">test</author>
|
||||
<date>2020-01-01T10:01:00+00:00</date>
|
||||
<msg xml:space="preserve">third</msg>
|
||||
@ -600,7 +597,6 @@ sh % "hg log --debug --style xml" == r"""
|
||||
<?xml version="1.0"?>
|
||||
<log>
|
||||
<logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
|
||||
<tag>tip</tag>
|
||||
<parent revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453" />
|
||||
<parent revision="-1" node="0000000000000000000000000000000000000000" />
|
||||
<author email="test">test</author>
|
||||
@ -733,7 +729,7 @@ sh % "hg log -vpr . -Tjson --stat" == r"""
|
||||
"date": [1577872860, 0],
|
||||
"desc": "third",
|
||||
"bookmarks": [],
|
||||
"tags": ["tip"],
|
||||
"tags": [],
|
||||
"parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
|
||||
"files": ["fourth", "second", "third"],
|
||||
"diffstat": " fourth | 1 +\n second | 1 -\n third | 1 +\n 3 files changed, 2 insertions(+), 1 deletions(-)\n",
|
||||
@ -753,7 +749,7 @@ sh % "hg --config 'diff.noprefix=True' log --git -vpr . -Tjson" == r"""
|
||||
"date": [1577872860, 0],
|
||||
"desc": "third",
|
||||
"bookmarks": [],
|
||||
"tags": ["tip"],
|
||||
"tags": [],
|
||||
"parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
|
||||
"files": ["fourth", "second", "third"],
|
||||
"diff": "diff --git a/second b/fourth\nrename from second\nrename to fourth\ndiff --git a/third b/third\nnew file mode 100644\n--- /dev/null\n+++ b/third\n@@ -0,0 +1,1 @@\n+third\n"
|
||||
@ -771,7 +767,7 @@ sh % "hg log -T json" == r"""
|
||||
"date": [1577872860, 0],
|
||||
"desc": "third",
|
||||
"bookmarks": [],
|
||||
"tags": ["tip"],
|
||||
"tags": [],
|
||||
"parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"]
|
||||
},
|
||||
{
|
||||
@ -883,7 +879,7 @@ sh % "hg heads -v -Tjson" == r"""
|
||||
"date": [1577872860, 0],
|
||||
"desc": "third",
|
||||
"bookmarks": [],
|
||||
"tags": ["tip"],
|
||||
"tags": [],
|
||||
"parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
|
||||
"files": ["fourth", "second", "third"]
|
||||
},
|
||||
@ -913,7 +909,7 @@ sh % "hg log --debug -Tjson" == r"""
|
||||
"date": [1577872860, 0],
|
||||
"desc": "third",
|
||||
"bookmarks": [],
|
||||
"tags": ["tip"],
|
||||
"tags": [],
|
||||
"parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
|
||||
"manifest": "94961b75a2da554b4df6fb599e5bfc7d48de0c64",
|
||||
"extra": {"branch": "default"},
|
||||
@ -1158,7 +1154,7 @@ sh % "cat" << r"""
|
||||
changeset = '{tags % rev}'
|
||||
rev = '{rev} {tag}\n'
|
||||
""" > "issue4758"
|
||||
sh % "hg log --style ./issue4758 -r tip" == "8 tip"
|
||||
sh % "hg log --style ./issue4758 -r tip" == ""
|
||||
|
||||
# Check that {phase} works correctly on parents:
|
||||
|
||||
@ -1232,69 +1228,69 @@ sh % "hg log '--style=changelog'" > "changelog"
|
||||
sh % "cat changelog" == r"""
|
||||
2020-01-01 test <test>
|
||||
|
||||
* fourth, second, third:
|
||||
third
|
||||
[95c24699272e] [tip]
|
||||
* fourth, second, third:
|
||||
third
|
||||
[95c24699272e]
|
||||
|
||||
1970-01-12 User Name <user@hostname>
|
||||
|
||||
* second:
|
||||
second
|
||||
[29114dbae42b]
|
||||
* second:
|
||||
second
|
||||
[29114dbae42b]
|
||||
|
||||
1970-01-18 person <person>
|
||||
|
||||
* merge
|
||||
[f7e5795620e7]
|
||||
* merge
|
||||
[f7e5795620e7]
|
||||
|
||||
* d:
|
||||
new head
|
||||
[13207e5a10d9]
|
||||
* d:
|
||||
new head
|
||||
[13207e5a10d9]
|
||||
|
||||
1970-01-17 person <person>
|
||||
|
||||
* new branch
|
||||
[07fa1db10648]
|
||||
* new branch
|
||||
[07fa1db10648]
|
||||
|
||||
1970-01-16 person <person>
|
||||
|
||||
* c:
|
||||
no user, no domain
|
||||
[10e46f2dcbf4]
|
||||
* c:
|
||||
no user, no domain
|
||||
[10e46f2dcbf4]
|
||||
|
||||
1970-01-14 other <other@place>
|
||||
|
||||
* c:
|
||||
no person
|
||||
[97054abb4ab8]
|
||||
* c:
|
||||
no person
|
||||
[97054abb4ab8]
|
||||
|
||||
1970-01-13 A. N. Other <other@place>
|
||||
|
||||
* b:
|
||||
other 1 other 2
|
||||
* b:
|
||||
other 1 other 2
|
||||
|
||||
other 3
|
||||
[b608e9d1a3f0]
|
||||
other 3
|
||||
[b608e9d1a3f0]
|
||||
|
||||
1970-01-12 User Name <user@hostname>
|
||||
|
||||
* a:
|
||||
line 1 line 2
|
||||
[1e4e1b8f71e0]"""
|
||||
* a:
|
||||
line 1 line 2
|
||||
[1e4e1b8f71e0]"""
|
||||
|
||||
# Issue2130: xml output for 'hg heads' is malformed
|
||||
|
||||
sh % "hg heads --style changelog" == r"""
|
||||
2020-01-01 test <test>
|
||||
|
||||
* fourth, second, third:
|
||||
third
|
||||
[95c24699272e] [tip]
|
||||
* fourth, second, third:
|
||||
third
|
||||
[95c24699272e]
|
||||
|
||||
1970-01-18 person <person>
|
||||
|
||||
* merge
|
||||
[f7e5795620e7]"""
|
||||
* merge
|
||||
[f7e5795620e7]"""
|
||||
|
||||
# Keys work:
|
||||
|
||||
@ -1726,7 +1722,6 @@ eq(
|
||||
rev--debug: 2
|
||||
rev--debug: 1
|
||||
rev--debug: 0
|
||||
tags: tip
|
||||
tags:
|
||||
tags:
|
||||
tags:
|
||||
@ -1735,7 +1730,7 @@ eq(
|
||||
tags:
|
||||
tags:
|
||||
tags:
|
||||
tags--verbose: tip
|
||||
tags:
|
||||
tags--verbose:
|
||||
tags--verbose:
|
||||
tags--verbose:
|
||||
@ -1744,7 +1739,8 @@ eq(
|
||||
tags--verbose:
|
||||
tags--verbose:
|
||||
tags--verbose:
|
||||
tags--debug: tip
|
||||
tags--verbose:
|
||||
tags--debug:
|
||||
tags--debug:
|
||||
tags--debug:
|
||||
tags--debug:
|
||||
@ -2085,7 +2081,7 @@ sh % "hg log -l1 --template '{node|count} {node|short|count}\\n'" == "40 12"
|
||||
sh % 'hg log -l1 --template \'{revset("null^")|count} {revset(".")|count} {revset("0::3")|count}\\n\'' == "0 1 4"
|
||||
|
||||
sh % "hg log -G --template '{rev}: children: {children|count}, tags: {tags|count}, file_adds: {file_adds|count}, ancestors: {revset(\"ancestors(%s)\", rev)|count}'" == r"""
|
||||
@ 9: children: 0, tags: 1, file_adds: 1, ancestors: 3
|
||||
@ 9: children: 0, tags: 0, file_adds: 1, ancestors: 3
|
||||
|
|
||||
o 8: children: 1, tags: 0, file_adds: 2, ancestors: 2
|
||||
|
|
||||
@ -2131,7 +2127,6 @@ color=
|
||||
|
||||
sh % "hg log -T status -r 10" == r"""
|
||||
changeset: 10:0f9759ec227a
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: Modify, add, remove, rename
|
||||
@ -2143,7 +2138,6 @@ sh % "hg log -T status -r 10" == r"""
|
||||
R fourth"""
|
||||
sh % "hg log -T status -C -r 10" == r"""
|
||||
changeset: 10:0f9759ec227a
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: Modify, add, remove, rename
|
||||
@ -2156,7 +2150,6 @@ sh % "hg log -T status -C -r 10" == r"""
|
||||
R fourth"""
|
||||
sh % "hg log -T status -C -r 10 -v" == r"""
|
||||
changeset: 10:0f9759ec227a
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
description:
|
||||
@ -2171,7 +2164,6 @@ sh % "hg log -T status -C -r 10 -v" == r"""
|
||||
R fourth"""
|
||||
sh % "hg log -T status -C -r 10 --debug" == r"""
|
||||
changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c
|
||||
tag: tip
|
||||
phase: secret
|
||||
parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
@ -2192,7 +2184,6 @@ sh % "hg log -T status -C -r 10 --debug" == r"""
|
||||
sh % "hg log -T status -C -r 10 --quiet" == "10:0f9759ec227a"
|
||||
sh % "hg '--color=debug' log -T status -r 10" == r"""
|
||||
[log.changeset changeset.secret|changeset: 10:0f9759ec227a]
|
||||
[log.tag|tag: tip]
|
||||
[log.user|user: test]
|
||||
[log.date|date: Thu Jan 01 00:00:00 1970 +0000]
|
||||
[log.summary|summary: Modify, add, remove, rename]
|
||||
@ -2204,7 +2195,6 @@ sh % "hg '--color=debug' log -T status -r 10" == r"""
|
||||
[status.removed|R fourth]"""
|
||||
sh % "hg '--color=debug' log -T status -C -r 10" == r"""
|
||||
[log.changeset changeset.secret|changeset: 10:0f9759ec227a]
|
||||
[log.tag|tag: tip]
|
||||
[log.user|user: test]
|
||||
[log.date|date: Thu Jan 01 00:00:00 1970 +0000]
|
||||
[log.summary|summary: Modify, add, remove, rename]
|
||||
@ -2217,7 +2207,6 @@ sh % "hg '--color=debug' log -T status -C -r 10" == r"""
|
||||
[status.removed|R fourth]"""
|
||||
sh % "hg '--color=debug' log -T status -C -r 10 -v" == r"""
|
||||
[log.changeset changeset.secret|changeset: 10:0f9759ec227a]
|
||||
[log.tag|tag: tip]
|
||||
[log.user|user: test]
|
||||
[log.date|date: Thu Jan 01 00:00:00 1970 +0000]
|
||||
[ui.note log.description|description:]
|
||||
@ -2232,7 +2221,6 @@ sh % "hg '--color=debug' log -T status -C -r 10 -v" == r"""
|
||||
[status.removed|R fourth]"""
|
||||
sh % "hg '--color=debug' log -T status -C -r 10 --debug" == r"""
|
||||
[log.changeset changeset.secret|changeset: 10:0f9759ec227a4859c2014a345cd8a859022b7c6c]
|
||||
[log.tag|tag: tip]
|
||||
[log.phase|phase: secret]
|
||||
[log.parent changeset.secret|parent: 9:bf9dfba36635106d6a73ccc01e28b762da60e066]
|
||||
[log.parent changeset.public|parent: -1:0000000000000000000000000000000000000000]
|
||||
@ -3814,7 +3802,7 @@ sh % 'hg --config "extensions.revnamesext=$TESTDIR/revnamesext.py" log -T \'{rev
|
||||
bookmarks color=bookmark builtin=True
|
||||
bar,foo,text.{rev}
|
||||
tags color=tag builtin=True
|
||||
tip
|
||||
|
||||
branches color=branch builtin=True
|
||||
default
|
||||
revnames color=revname builtin=False
|
||||
@ -3824,7 +3812,7 @@ sh % 'hg --config "extensions.revnamesext=$TESTDIR/revnamesext.py" log -T \'{rev
|
||||
bookmarks color=bookmark builtin=True
|
||||
baz
|
||||
tags color=tag builtin=True
|
||||
(trailing space)
|
||||
|
||||
branches color=branch builtin=True
|
||||
default
|
||||
revnames color=revname builtin=False
|
||||
@ -3832,9 +3820,9 @@ sh % 'hg --config "extensions.revnamesext=$TESTDIR/revnamesext.py" log -T \'{rev
|
||||
|
||||
0
|
||||
bookmarks color=bookmark builtin=True
|
||||
(trailing space)
|
||||
|
||||
tags color=tag builtin=True
|
||||
(trailing space)
|
||||
|
||||
branches color=branch builtin=True
|
||||
default
|
||||
revnames color=revname builtin=False
|
||||
@ -3847,7 +3835,7 @@ del namespaces.namespacetable["revnames"]
|
||||
|
||||
sh % "hg log -r2 -T '{namespaces % \"{namespace}: {names}\\n\"}'" == r"""
|
||||
bookmarks: bar foo text.{rev}
|
||||
tags: tip
|
||||
tags:
|
||||
branches: default"""
|
||||
sh % 'hg log -r2 -T \'{namespaces % "{namespace}:\\n{names % " {name}\\n"}"}\'' == r"""
|
||||
bookmarks:
|
||||
@ -3855,7 +3843,6 @@ sh % 'hg log -r2 -T \'{namespaces % "{namespace}:\\n{names % " {name}\\n"}"}\''
|
||||
foo
|
||||
text.{rev}
|
||||
tags:
|
||||
tip
|
||||
branches:
|
||||
default"""
|
||||
sh % 'hg log -r2 -T \'{get(namespaces, "bookmarks") % "{name}\\n"}\'' == r"""
|
||||
|
||||
@ -42,7 +42,7 @@ Amending changeset with changes in working dir:
|
||||
$ echo a >> A
|
||||
$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1'
|
||||
pretxncommit 217e580a9218a74044be7970e41021181317b52b
|
||||
217e580a9218 tip
|
||||
217e580a9218
|
||||
|
||||
$ echo '%unset pretxncommit.foo' >> $HGRCPATH
|
||||
|
||||
@ -134,7 +134,6 @@ Test -u/-d:
|
||||
|
||||
$ hg log -r .
|
||||
changeset: 7:815553afc946
|
||||
tag: tip
|
||||
parent: 0:4a2df7238c3b
|
||||
user: foo
|
||||
date: Thu Jan 01 00:00:01 1970 +0000
|
||||
@ -224,7 +223,6 @@ Same, but with changes in working dir (different code path):
|
||||
$ rm editor.sh
|
||||
$ hg log -r .
|
||||
changeset: 9:f7f2c5aae908
|
||||
tag: tip
|
||||
parent: 0:4a2df7238c3b
|
||||
user: foo
|
||||
date: Thu Jan 01 00:00:01 1970 +0000
|
||||
@ -554,7 +552,6 @@ Test if amend preserves executable bit changes
|
||||
$ hg ci --amend -m "chmod amended second time"
|
||||
$ hg log -p --git -r .
|
||||
changeset: 4:b4aab18bba3e
|
||||
tag: tip
|
||||
parent: 1:112478962961
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
|
||||
@ -46,7 +46,6 @@ Committing some changes but stopping on the way
|
||||
[1]
|
||||
$ hg tip
|
||||
changeset: -1:000000000000
|
||||
tag: tip
|
||||
user:
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
|
||||
@ -59,7 +58,6 @@ Committing some changes
|
||||
$ hg commit -i -m "a" -d "0 0"
|
||||
$ hg tip
|
||||
changeset: 0:cb9a9f314b8b
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: a
|
||||
@ -82,7 +80,6 @@ Committing only one file
|
||||
$ hg commit -i -m "one file" -d "0 0"
|
||||
$ hg tip
|
||||
changeset: 1:fb2705a663ea
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: one file
|
||||
@ -127,7 +124,6 @@ Committing only one hunk while aborting edition of hunk
|
||||
$ rm editor.sh
|
||||
$ hg tip
|
||||
changeset: 2:7d10dfe755a8
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: one hunk
|
||||
@ -160,7 +156,6 @@ Committing only one hunk while aborting edition of hunk
|
||||
$ hg commit -m "other hunks"
|
||||
$ hg tip
|
||||
changeset: 3:a6735021574d
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: other hunks
|
||||
|
||||
@ -32,7 +32,6 @@ Select no files
|
||||
|
||||
$ hg tip -p
|
||||
changeset: -1:000000000000
|
||||
tag: tip
|
||||
user:
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
|
||||
@ -53,7 +52,6 @@ Select files but no hunks
|
||||
|
||||
$ hg tip -p
|
||||
changeset: -1:000000000000
|
||||
tag: tip
|
||||
user:
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
|
||||
@ -80,7 +78,6 @@ Record empty file
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 0:c0708cf4e46e
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: empty
|
||||
@ -90,7 +87,7 @@ Record empty file
|
||||
Summary shows we updated to the new cset
|
||||
|
||||
$ hg summary
|
||||
parent: 0:c0708cf4e46e tip
|
||||
parent: 0:c0708cf4e46e
|
||||
empty
|
||||
commit: (clean)
|
||||
phases: 1 draft
|
||||
@ -109,7 +106,6 @@ Rename empty file
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 1:d695e8dcb197
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:01 1970 +0000
|
||||
summary: rename
|
||||
@ -130,7 +126,6 @@ Copy empty file
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 2:1d4b90bea524
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:02 1970 +0000
|
||||
summary: copy
|
||||
@ -150,7 +145,6 @@ Delete empty file
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 3:b39a238f01a1
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:03 1970 +0000
|
||||
summary: delete
|
||||
@ -173,7 +167,6 @@ Add binary file
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 4:72e9d7d0ef46
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:04 1970 +0000
|
||||
summary: binary
|
||||
@ -196,7 +189,6 @@ Change binary file
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 5:c0f95062740f
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:05 1970 +0000
|
||||
summary: binary-change
|
||||
@ -222,7 +214,6 @@ Rename and change binary file
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 6:121c8f7bde73
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:06 1970 +0000
|
||||
summary: binary-change-rename
|
||||
@ -263,7 +254,6 @@ Add plain file
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 7:25bd6137b6e6
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:07 1970 +0000
|
||||
summary: plain
|
||||
@ -531,7 +521,6 @@ changes numbering
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 13:0e4b75d875cd
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:10 1970 +0000
|
||||
summary: begin-and-end
|
||||
@ -603,7 +592,6 @@ Record end
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 14:1a962fbf33f8
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:11 1970 +0000
|
||||
summary: end-only
|
||||
@ -641,7 +629,6 @@ Record beginning
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 15:848213c8ae97
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:12 1970 +0000
|
||||
summary: begin-only
|
||||
@ -749,7 +736,6 @@ Record beginning, middle, and test that format-breaking diffopts are ignored
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 17:62a02df29cdd
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:14 1970 +0000
|
||||
summary: middle-only
|
||||
@ -791,7 +777,6 @@ Record end
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 18:40f1eaffc151
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:15 1970 +0000
|
||||
summary: end-only
|
||||
@ -830,7 +815,6 @@ Record end
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 20:3698085a8c2a
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:16 1970 +0000
|
||||
summary: subdir-change
|
||||
@ -977,7 +961,6 @@ s, all
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 22:b6ec082e5d4f
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:18 1970 +0000
|
||||
summary: x
|
||||
@ -1002,7 +985,6 @@ f
|
||||
|
||||
$ hg tip -p
|
||||
changeset: 23:f0c58857264c
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:19 1970 +0000
|
||||
summary: y
|
||||
@ -1041,7 +1023,6 @@ Preserve chmod +x
|
||||
|
||||
$ hg tip --config diff.git=True -p
|
||||
changeset: 24:04dff1450229
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:20 1970 +0000
|
||||
summary: z
|
||||
@ -1079,7 +1060,6 @@ Preserve execute permission on original
|
||||
|
||||
$ hg tip --config diff.git=True -p
|
||||
changeset: 25:e43fd23533b3
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:21 1970 +0000
|
||||
summary: aa
|
||||
@ -1119,7 +1099,6 @@ Preserve chmod -x
|
||||
|
||||
$ hg tip --config diff.git=True -p
|
||||
changeset: 26:d685544b7481
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:22 1970 +0000
|
||||
summary: ab
|
||||
@ -1162,7 +1141,6 @@ Mock "Preserve chmod +x"
|
||||
|
||||
$ hg tip --config diff.git=True -p
|
||||
changeset: 24:c26cfe2c4eb0
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:20 1970 +0000
|
||||
summary: z
|
||||
@ -1198,7 +1176,6 @@ Mock "Preserve execute permission on original"
|
||||
|
||||
$ hg tip --config diff.git=True -p
|
||||
changeset: 25:a48d2d60adde
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:21 1970 +0000
|
||||
summary: aa
|
||||
@ -1236,7 +1213,6 @@ Mock "Preserve chmod -x"
|
||||
|
||||
$ hg tip --config diff.git=True -p
|
||||
changeset: 26:5cc89ae210fa
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:22 1970 +0000
|
||||
summary: ab
|
||||
@ -1547,7 +1523,6 @@ Ignore win32text deprecation warning for now:
|
||||
C subdir/f1
|
||||
$ hg tip -p
|
||||
changeset: 29:ae3cd1fa0aef
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:24 1970 +0000
|
||||
summary: w1
|
||||
@ -1617,7 +1592,6 @@ The #if execbit block above changes the hash here on some systems
|
||||
C plain3
|
||||
$ hg tip
|
||||
changeset: 31:113649fb68c0
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:23 1970 +0000
|
||||
summary: moving_files
|
||||
@ -1682,7 +1656,6 @@ Add new file from within a subdirectory
|
||||
The #if execbit block above changes the hashes here on some systems
|
||||
$ hg tip -p
|
||||
changeset: 33:211b43f781aa
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:23 1970 +0000
|
||||
summary: newfilesubdir
|
||||
|
||||
@ -214,7 +214,6 @@ subdir log 2
|
||||
|
||||
$ hg log -v bar
|
||||
changeset: 1:aa809156d50d
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
files: bar/bar
|
||||
@ -227,7 +226,6 @@ full log
|
||||
|
||||
$ hg log -v
|
||||
changeset: 1:aa809156d50d
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
files: bar/bar
|
||||
@ -273,7 +271,6 @@ full log
|
||||
|
||||
$ hg log -v
|
||||
changeset: 1:95b38e3a5b2e
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
files: foo/plain-file
|
||||
@ -295,7 +292,6 @@ subdir log
|
||||
$ cd foo
|
||||
$ hg log .
|
||||
changeset: 1:95b38e3a5b2e
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: commit-foo-dot
|
||||
@ -638,7 +634,6 @@ Test making empty commits
|
||||
$ hg commit --config ui.allowemptycommit=True -m "empty commit"
|
||||
$ hg log -r . -v --stat
|
||||
changeset: 2:d809f3644287
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
description:
|
||||
|
||||
@ -17,7 +17,6 @@ We are making commit in repo (server) and will recover it in client 1 via short
|
||||
$ hg clone ssh://user@dummy/repo client2 -q
|
||||
$ (cd repo && mkcommit somecommit && hg log -r .)
|
||||
changeset: 0:f8b49bf62d4d
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: somecommit
|
||||
@ -45,7 +44,6 @@ We will also run few checks with `hg hide` / `hg up` commands.
|
||||
$ mkcommit someothercommit
|
||||
$ hg log -r .
|
||||
changeset: 1:c1b6fe8fce73
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: someothercommit
|
||||
|
||||
@ -107,8 +107,7 @@ Clone fresh repo and try to restore from backup
|
||||
$ hg sl --all
|
||||
@ changeset: 2:948715751816
|
||||
| bookmark: master
|
||||
~ tag: tip
|
||||
user: test
|
||||
~ user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: add b
|
||||
(re)
|
||||
@ -141,7 +140,6 @@ Clone fresh repo and try to restore from backup
|
||||
: summary: add b
|
||||
:
|
||||
: o changeset: 4:3969cd9723d1
|
||||
: | tag: tip
|
||||
: | user: test
|
||||
: | date: Thu Jan 01 00:00:00 1970 +0000
|
||||
: | instability: orphan
|
||||
@ -198,7 +196,6 @@ Test createlandedasmarkers option disabled
|
||||
: summary: add b
|
||||
:
|
||||
: o changeset: 4:3969cd9723d1
|
||||
: | tag: tip
|
||||
: | user: test
|
||||
: | date: Thu Jan 01 00:00:00 1970 +0000
|
||||
: | summary: add c
|
||||
|
||||
@ -58,7 +58,6 @@ Pull scratch commit from the second client
|
||||
$ hg log -G
|
||||
@ changeset: 0:2d9cfa751213
|
||||
bookmark: scratch/book
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: scratchcommit
|
||||
|
||||
@ -503,7 +503,7 @@ Create logs directory and set correct permissions
|
||||
26805aba1e600a82e93661149f2313866a221a7b backed up
|
||||
$ hg rebase -s B -d D --config infinitepushbackup.autobackup=True --config infinitepushbackup.logdir=$TESTTMP/logs
|
||||
rebasing 112478962961 "B" (B)
|
||||
rebasing 26805aba1e60 "C" (C tip)
|
||||
rebasing 26805aba1e60 "C" (C)
|
||||
$ waitbgbackup
|
||||
$ hg log -r ':' -G -T '{desc} {node}'
|
||||
o C ffeec75ec60331057b875fc5356c57c3ff204500
|
||||
|
||||
@ -607,7 +607,7 @@ Expected result: client2 should be moved to 68e035cc1996
|
||||
$ hg id -i
|
||||
99e818be5af0
|
||||
$ hg rebase -s 99e818be5af0 -d a7bb357e7299 -m "`hg descr | head -n1` rebased" --collapse
|
||||
rebasing 99e818be5af0 "commit2 amended amended rebased amended" (tip)
|
||||
rebasing 99e818be5af0 "commit2 amended amended rebased amended"
|
||||
$ echo 6 >> filea.txt && hg amend -m "`hg descr | head -n1` amended"
|
||||
$ tglog -r '.'
|
||||
@ 15: 68e035cc1996 'commit2 amended amended rebased amended rebased amended'
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
$ hg commit -m commit-1
|
||||
$ hg tip
|
||||
changeset: 0:53f268a58230
|
||||
tag: tip
|
||||
user: My Name <myname@example.com>
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: commit-1
|
||||
@ -22,7 +21,6 @@
|
||||
$ hg commit -u "foo@bar.com" -m commit-1
|
||||
$ hg tip
|
||||
changeset: 1:3871b2a9e9bf
|
||||
tag: tip
|
||||
user: foo@bar.com
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: commit-1
|
||||
@ -33,7 +31,6 @@
|
||||
$ hg commit -m commit-1
|
||||
$ hg tip
|
||||
changeset: 2:8eeac6695c1c
|
||||
tag: tip
|
||||
user: foobar <foo@bar.com>
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: commit-1
|
||||
@ -42,7 +39,6 @@
|
||||
$ hg commit -u "foo@bar.com" -m commit-1
|
||||
$ hg tip
|
||||
changeset: 3:957606a725e4
|
||||
tag: tip
|
||||
user: foo@bar.com
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: commit-1
|
||||
@ -63,7 +59,6 @@
|
||||
$ hg commit -m commit-1
|
||||
$ hg tip
|
||||
changeset: 4:6f24bfb4c617
|
||||
tag: tip
|
||||
user: Foo Bar II <foo2@bar.com>
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: commit-1
|
||||
@ -87,7 +82,6 @@
|
||||
enter a commit username: Asked User <ask@example.com>
|
||||
$ hg tip
|
||||
changeset: 5:84c91d963b70
|
||||
tag: tip
|
||||
user: Asked User <ask@example.com>
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: ask
|
||||
|
||||
@ -445,7 +445,6 @@ Test debugnamecomplete
|
||||
default
|
||||
fee
|
||||
fo
|
||||
tip
|
||||
$ hg debugnamecomplete f
|
||||
fee
|
||||
fo
|
||||
@ -458,7 +457,6 @@ used for completions in some shells.
|
||||
default
|
||||
fee
|
||||
fo
|
||||
tip
|
||||
$ hg debuglabelcomplete f
|
||||
fee
|
||||
fo
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
[1]
|
||||
|
||||
$ hg id
|
||||
618808747361+c0c68e4fe667+ tip
|
||||
618808747361+c0c68e4fe667+
|
||||
|
||||
$ echo "[commands]" >> $HGRCPATH
|
||||
$ echo "status.verbose=true" >> $HGRCPATH
|
||||
|
||||
@ -32,7 +32,6 @@ Tests about metadataonlyctx
|
||||
$ hg --config extensions.metaedit=$TESTTMP/metaedit.py metaedit 'text=Changed'
|
||||
$ hg log -r tip
|
||||
changeset: 3:ad83e9e00ec9
|
||||
tag: tip
|
||||
parent: 1:3afb7afe6632
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -44,7 +43,6 @@ Tests about metadataonlyctx
|
||||
$ hg --config extensions.metaedit=$TESTTMP/metaedit.py metaedit 'user=foo <foo@example.com>'
|
||||
$ hg log -r tip
|
||||
changeset: 4:1f86eaeca92b
|
||||
tag: tip
|
||||
parent: 1:3afb7afe6632
|
||||
user: foo <foo@example.com>
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
|
||||
@ -43,7 +43,6 @@ sh % "hg convert --authors authormap.txt orig new" == r"""
|
||||
sh % "cat new/.hg/authormap" == "user name=Long User Name"
|
||||
sh % "hg -Rnew log" == r"""
|
||||
changeset: 0:d89716e88087
|
||||
tag: tip
|
||||
user: Long User Name
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: foo"""
|
||||
@ -61,7 +60,6 @@ sh % "hg convert orig new" == r"""
|
||||
0 foo"""
|
||||
sh % "hg -Rnew log" == r"""
|
||||
changeset: 0:d89716e88087
|
||||
tag: tip
|
||||
user: Long User Name
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: foo"""
|
||||
|
||||
@ -90,7 +90,6 @@ Remove the directory, then try to replace it with a file (issue754)
|
||||
$ hg -R git-repo-hg tip -v
|
||||
changeset: 5:c78094926be2
|
||||
bookmark: master
|
||||
tag: tip
|
||||
parent: 3:f5f5cb45432b
|
||||
parent: 4:4e174f80c67c
|
||||
user: test <test@example.org>
|
||||
@ -411,7 +410,6 @@ convert author committer
|
||||
$ hg -R git-repo4-hg log -v
|
||||
changeset: 1:d63e967f93da
|
||||
bookmark: master
|
||||
tag: tip
|
||||
user: nottest <test@example.org>
|
||||
date: Mon Jan 01 00:00:21 2007 +0000
|
||||
files: foo
|
||||
@ -461,7 +459,6 @@ custom prefix on messagedifferent works
|
||||
$ hg -R git-repo4-hg-messagedifferentprefix log -v
|
||||
changeset: 1:2fe0c98a109d
|
||||
bookmark: master
|
||||
tag: tip
|
||||
user: nottest <test@example.org>
|
||||
date: Mon Jan 01 00:00:21 2007 +0000
|
||||
files: foo
|
||||
@ -494,7 +491,6 @@ messagealways will always add the "committer: " line even if committer identical
|
||||
$ hg -R git-repo4-hg-messagealways log -v
|
||||
changeset: 1:8db057d8cd37
|
||||
bookmark: master
|
||||
tag: tip
|
||||
user: nottest <test@example.org>
|
||||
date: Mon Jan 01 00:00:21 2007 +0000
|
||||
files: foo
|
||||
@ -529,7 +525,6 @@ custom prefix on messagealways works
|
||||
$ hg -R git-repo4-hg-messagealwaysprefix log -v
|
||||
changeset: 1:83c17174de79
|
||||
bookmark: master
|
||||
tag: tip
|
||||
user: nottest <test@example.org>
|
||||
date: Mon Jan 01 00:00:21 2007 +0000
|
||||
files: foo
|
||||
@ -564,7 +559,6 @@ replaceauthor replaces author with committer
|
||||
$ hg -R git-repo4-hg-replaceauthor log -v
|
||||
changeset: 1:122c1d8999ea
|
||||
bookmark: master
|
||||
tag: tip
|
||||
user: test <test@example.org>
|
||||
date: Mon Jan 01 00:00:21 2007 +0000
|
||||
files: foo
|
||||
@ -595,7 +589,6 @@ dropcommitter removes the committer
|
||||
$ hg -R git-repo4-hg-dropcommitter log -v
|
||||
changeset: 1:190b2da396cc
|
||||
bookmark: master
|
||||
tag: tip
|
||||
user: nottest <test@example.org>
|
||||
date: Mon Jan 01 00:00:21 2007 +0000
|
||||
files: foo
|
||||
@ -756,7 +749,6 @@ convert sub modules
|
||||
$ hg -R git-repo6-hg log -v
|
||||
changeset: 0:* (glob)
|
||||
bookmark: master
|
||||
tag: tip
|
||||
user: nottest <test@example.org>
|
||||
date: Mon Jan 01 00:00:23 2007 +0000
|
||||
description:
|
||||
@ -967,7 +959,6 @@ convert will not retain custom metadata keys by default
|
||||
$ hg -R hgextras1 log --debug -r 1
|
||||
changeset: 1:e13a39880f68479127b2a80fa0b448cc8524aa09
|
||||
bookmark: master
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 0:dcb68977c55cd02cbd13b901df65c4b6e7b9c4b9
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
@ -1002,7 +993,6 @@ Converting a specific extra works
|
||||
$ hg -R hgextras2 log --debug -r 1
|
||||
changeset: 1:d40fb205d58597e6ecfd55b16f198be5bf436391
|
||||
bookmark: master
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 0:dcb68977c55cd02cbd13b901df65c4b6e7b9c4b9
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
@ -1031,7 +1021,6 @@ Converting multiple extras works
|
||||
$ hg -R hgextras3 log --debug -r 1
|
||||
changeset: 1:0105af33379e7b6491501fd34141b7af700fe125
|
||||
bookmark: master
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 0:dcb68977c55cd02cbd13b901df65c4b6e7b9c4b9
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
@ -1061,7 +1050,6 @@ convert.git.saverev can be disabled to prevent convert_revision from being writt
|
||||
$ hg -R hgextras4 log --debug -r 1
|
||||
changeset: 1:1dcaf4ffe5bee43fa86db2800821f6f0af212c5c
|
||||
bookmark: master
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 0:a13935fec4daf06a5a87a7307ccb0fc94f98d06d
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
@ -1089,7 +1077,6 @@ convert_revision from source
|
||||
$ hg -R hgextras5 log --debug -r 1
|
||||
changeset: 1:574d85931544d4542007664fee3747360e85ee28
|
||||
bookmark: master
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 0:a13935fec4daf06a5a87a7307ccb0fc94f98d06d
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
$ hg log
|
||||
changeset: 3:593cbf6fb2b4
|
||||
tag: local-tag
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: Added tag some-tag for changeset ad681a868e44
|
||||
@ -136,7 +135,6 @@ test tag rewriting
|
||||
0 add baz
|
||||
$ cd new-filemap
|
||||
$ hg tags
|
||||
tip 2:3c74706b1ff8
|
||||
some-tag 0:ba8636729451
|
||||
$ cd ..
|
||||
|
||||
@ -294,7 +292,6 @@ Make changes in dest and convert back:
|
||||
$ hg -R dest ci -Aqm 'change in dest'
|
||||
$ hg -R dest tip
|
||||
changeset: 5:a2e0e3cc6d1d
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: change in dest
|
||||
@ -313,7 +310,6 @@ Verify the conversion back:
|
||||
|
||||
$ hg -R source log --debug -r tip
|
||||
changeset: 7:e6d364a69ff1248b2099e603b0c145504cade6f0
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 6:0613c8e59a3ddb9789072ef52f1ed13496489bb4
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
@ -465,7 +461,6 @@ Two way tests
|
||||
|
||||
$ hg -R 0 log -G
|
||||
o changeset: 2:637fbbbe96b6
|
||||
| tag: tip
|
||||
| parent: 0:8a028c7c77f6
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
|
||||
@ -321,7 +321,7 @@ convert
|
||||
1 initial
|
||||
0 keywords
|
||||
$ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
|
||||
rev=1 desc="keywords" tags="tip" files="crazy_symlink+k file_binary file_binary+k file_binary+kx file_binary+x file_ctext file_cxtext file_ktext file_kxtext file_ltext file_tempobj file_text file_text+c file_text+d file_text+f file_text+k file_text+ko file_text+kx file_text+l file_text+m file_text+s file_text+s2 file_text+w file_text+x file_ubinary file_uxbinary file_xbinary file_xltext file_xtempobj file_xtext target_symlink target_symlink+k"
|
||||
rev=1 desc="keywords" tags="" files="crazy_symlink+k file_binary file_binary+k file_binary+kx file_binary+x file_ctext file_cxtext file_ktext file_kxtext file_ltext file_tempobj file_text file_text+c file_text+d file_text+f file_text+k file_text+ko file_text+kx file_text+l file_text+m file_text+s file_text+s2 file_text+w file_text+x file_ubinary file_uxbinary file_xbinary file_xltext file_xtempobj file_xtext target_symlink target_symlink+k"
|
||||
rev=0 desc="initial" tags="" files="file_binary file_binary+k file_binary+kx file_binary+x file_ctext file_cxtext file_ktext file_kxtext file_ltext file_symlink file_symlink+k file_text file_text+c file_text+d file_text+f file_text+k file_text+ko file_text+kx file_text+l file_text+m file_text+s2 file_text+w file_text+x file_ubinary file_uxbinary file_xbinary file_xltext file_xtext target_symlink target_symlink+k"
|
||||
|
||||
revision 0
|
||||
|
||||
@ -83,7 +83,7 @@ convert
|
||||
1 change a
|
||||
0 change b/c
|
||||
$ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
|
||||
rev=2 desc="change b/c" tags="tip" files="b/c"
|
||||
rev=2 desc="change b/c" tags="" files="b/c"
|
||||
rev=1 desc="change a" tags="" files="a"
|
||||
rev=0 desc="initial" tags="" files="a b/c"
|
||||
|
||||
@ -110,7 +110,7 @@ convert again
|
||||
converting...
|
||||
0 change a b/c
|
||||
$ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
|
||||
rev=3 desc="change a b/c" tags="tip" files="a b/c"
|
||||
rev=3 desc="change a b/c" tags="" files="a b/c"
|
||||
rev=2 desc="change b/c" tags="" files="b/c"
|
||||
rev=1 desc="change a" tags="" files="a"
|
||||
rev=0 desc="initial" tags="" files="a b/c"
|
||||
@ -139,7 +139,7 @@ convert again
|
||||
converting...
|
||||
0 add d e f
|
||||
$ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
|
||||
rev=4 desc="add d e f" tags="tip" files=" e/ f d d"
|
||||
rev=4 desc="add d e f" tags="" files=" e/ f d d"
|
||||
rev=3 desc="change a b/c" tags="" files="a b/c"
|
||||
rev=2 desc="change b/c" tags="" files="b/c"
|
||||
rev=1 desc="change a" tags="" files="a"
|
||||
|
||||
@ -59,7 +59,6 @@ Convert without tags
|
||||
0 rev1
|
||||
updating bookmarks
|
||||
$ hg -R hg-repo tags
|
||||
tip 0:d98c8ad3a4cf
|
||||
$ rm -rf hg-repo
|
||||
|
||||
Do a first conversion
|
||||
|
||||
@ -73,7 +73,7 @@ Test disabling copy tracing
|
||||
|
||||
$ hg up -qC 2
|
||||
$ hg rebase --keep -d 1 -b 2 --config extensions.rebase=
|
||||
rebasing add3f11052fa "other" (tip)
|
||||
rebasing add3f11052fa "other"
|
||||
merging b and a to b
|
||||
merging c and a to c
|
||||
|
||||
@ -91,7 +91,7 @@ Test disabling copy tracing
|
||||
$ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF
|
||||
> c
|
||||
> EOF
|
||||
rebasing add3f11052fa "other" (tip)
|
||||
rebasing add3f11052fa "other"
|
||||
other [source] changed a which local [dest] deleted
|
||||
use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? c
|
||||
|
||||
@ -158,12 +158,11 @@ Verify we duplicate existing copies, instead of detecting them
|
||||
o 0 add a
|
||||
|
||||
$ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.copytrace=off
|
||||
rebasing 47e1a9e6273b "copy a->b (2)" (tip)
|
||||
rebasing 47e1a9e6273b "copy a->b (2)"
|
||||
saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg
|
||||
|
||||
$ hg log -G -f b
|
||||
@ changeset: 3:76024fb4b05b
|
||||
: tag: tip
|
||||
: user: test
|
||||
: date: Thu Jan 01 00:00:00 1970 +0000
|
||||
: summary: copy a->b (2)
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
$ hg status
|
||||
A b
|
||||
$ hg sum
|
||||
parent: 0:c19d34741b0a tip
|
||||
parent: 0:c19d34741b0a
|
||||
1
|
||||
commit: 1 copied
|
||||
phases: 1 draft
|
||||
@ -39,7 +39,6 @@ we should see two history entries
|
||||
|
||||
$ hg history -v
|
||||
changeset: 1:93580a2c28a5
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
files: b
|
||||
@ -75,7 +74,6 @@ we should see one log entry for b
|
||||
|
||||
$ hg log b
|
||||
changeset: 1:93580a2c28a5
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: 2
|
||||
|
||||
@ -57,7 +57,7 @@ Check filename heuristics (same dirname and same basename)
|
||||
desc: initial
|
||||
|
||||
$ hg rebase -s . -d 1
|
||||
rebasing 557f403c0afd "mod a, mod dir/file.txt" (tip)
|
||||
rebasing 557f403c0afd "mod a, mod dir/file.txt"
|
||||
merging b and a to b
|
||||
merging dir2/file.txt and dir/file.txt to dir2/file.txt
|
||||
$ cd ..
|
||||
@ -89,7 +89,7 @@ Make sure filename heuristics do not when they are not related
|
||||
desc: initial
|
||||
|
||||
$ hg rebase -s . -d 1
|
||||
rebasing d526312210b9 "mode a" (tip)
|
||||
rebasing d526312210b9 "mode a"
|
||||
other [source] changed a which local [dest] deleted
|
||||
use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? u
|
||||
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
||||
@ -127,7 +127,7 @@ Test when lca didn't modified the file that was moved
|
||||
desc: initial, phase: draft
|
||||
|
||||
$ hg rebase -s . -d 2
|
||||
rebasing 9d5cf99c3d9f "mod a" (tip)
|
||||
rebasing 9d5cf99c3d9f "mod a"
|
||||
merging b and a to b
|
||||
$ cd ..
|
||||
$ rm -rf repo
|
||||
@ -161,7 +161,7 @@ Rebase "backwards"
|
||||
desc: initial
|
||||
|
||||
$ hg rebase -s . -d 0
|
||||
rebasing fbe97126b396 "mod b" (tip)
|
||||
rebasing fbe97126b396 "mod b"
|
||||
merging a and b to a
|
||||
$ cd ..
|
||||
$ rm -rf repo
|
||||
@ -197,7 +197,7 @@ Check a few potential move candidates
|
||||
desc: initial
|
||||
|
||||
$ hg rebase -s . -d 2
|
||||
rebasing 6b2f4cece40f "mod dir/a" (tip)
|
||||
rebasing 6b2f4cece40f "mod dir/a"
|
||||
merging dir/b and dir/a to dir/b
|
||||
$ cd ..
|
||||
$ rm -rf repo
|
||||
@ -240,7 +240,7 @@ Test the copytrace.movecandidateslimit with many move candidates
|
||||
With small limit
|
||||
|
||||
$ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0
|
||||
rebasing ef716627c70b "mod a" (tip)
|
||||
rebasing ef716627c70b "mod a"
|
||||
skipping copytracing for 'a', more candidates than the limit: 7
|
||||
other [source] changed a which local [dest] deleted
|
||||
use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? u
|
||||
@ -253,7 +253,7 @@ With small limit
|
||||
With default limit which is 100
|
||||
|
||||
$ hg rebase -s 2 -d 1
|
||||
rebasing ef716627c70b "mod a" (tip)
|
||||
rebasing ef716627c70b "mod a"
|
||||
merging foo and a to foo
|
||||
|
||||
$ cd ..
|
||||
@ -315,7 +315,7 @@ Move a directory in draft branch
|
||||
desc: initial
|
||||
|
||||
$ hg rebase -s . -d 1
|
||||
rebasing a33d80b6e352 "mv dir/ dir2/" (tip)
|
||||
rebasing a33d80b6e352 "mv dir/ dir2/"
|
||||
merging dir/a and dir2/a to dir2/a
|
||||
$ cd ..
|
||||
$ rm -rf server
|
||||
@ -348,7 +348,7 @@ Move file twice and rebase mod on top of moves
|
||||
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
|
||||
desc: initial
|
||||
$ hg rebase -s . -d 2
|
||||
rebasing d41316942216 "mod a" (tip)
|
||||
rebasing d41316942216 "mod a"
|
||||
merging c and a to c
|
||||
|
||||
$ cd ..
|
||||
@ -417,7 +417,7 @@ Move one file and add another file in the same folder in one branch, modify file
|
||||
desc: initial
|
||||
|
||||
$ hg rebase -s . -d 2
|
||||
rebasing ef716627c70b "mod a" (tip)
|
||||
rebasing ef716627c70b "mod a"
|
||||
merging b and a to b
|
||||
$ ls
|
||||
b
|
||||
@ -485,7 +485,7 @@ Copy and move file
|
||||
desc: initial
|
||||
|
||||
$ hg rebase -s . -d 1
|
||||
rebasing ef716627c70b "mod a" (tip)
|
||||
rebasing ef716627c70b "mod a"
|
||||
merging b and a to b
|
||||
merging c and a to c
|
||||
$ ls
|
||||
@ -609,7 +609,7 @@ File directory and base name changed in same move
|
||||
desc initial, phase: draft
|
||||
|
||||
$ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
|
||||
rebasing 6207d2d318e7 "mod a" (tip)
|
||||
rebasing 6207d2d318e7 "mod a"
|
||||
merging dir2/b and dir1/a to dir2/b
|
||||
$ cat dir2/b
|
||||
a
|
||||
@ -646,7 +646,7 @@ in other merge parent. File moved on rebase.
|
||||
desc initial, phase: draft
|
||||
|
||||
$ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100
|
||||
rebasing e8919e7df8d0 "mv dir1 dir2" (tip)
|
||||
rebasing e8919e7df8d0 "mv dir1 dir2"
|
||||
$ ls dir2
|
||||
a
|
||||
dummy
|
||||
|
||||
@ -40,7 +40,7 @@ sh % "hg debugdag -t -b" == r"""
|
||||
+2:f
|
||||
+3:p2
|
||||
@temp*f+3
|
||||
@default*/p2+2:tip"""
|
||||
@default*/p2+2"""
|
||||
# tip
|
||||
sh % "hg id" == "000000000000"
|
||||
# glog
|
||||
@ -84,7 +84,7 @@ sh % "hg debugdag -t -b" == r"""
|
||||
@default+1:f
|
||||
+3:p2
|
||||
@temp*f+3
|
||||
@default*/p2+2:tip"""
|
||||
@default*/p2+2"""
|
||||
# tip
|
||||
sh % "hg id" == "000000000000"
|
||||
# glog
|
||||
@ -139,7 +139,6 @@ sh % "hg log -G --template '{rev}: {desc} [{branches}]\\n' of" == r"""
|
||||
o 0: r0 [start]"""
|
||||
# tags
|
||||
sh % "hg tags -v" == r"""
|
||||
tip 11:9ffe238a67a2
|
||||
p2 4:bbccf1697690 local
|
||||
f 1:f778700ebd50 local"""
|
||||
# cat of
|
||||
@ -156,7 +155,7 @@ sh % "hg debugdag -t -b" == r"""
|
||||
+2:f
|
||||
+3:p2
|
||||
@temp*f+3
|
||||
@default*/p2+2:tip"""
|
||||
@default*/p2+2"""
|
||||
# tip
|
||||
sh % "hg id" == "000000000000"
|
||||
# glog
|
||||
|
||||
@ -44,7 +44,6 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
|
||||
$ hg log
|
||||
changeset: 4:443431ffac4f
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: e
|
||||
@ -75,7 +74,6 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
% before update 4, strip 4
|
||||
changeset: 4:443431ffac4f
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: e
|
||||
@ -84,7 +82,6 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
|
||||
% after update 4, strip 4
|
||||
changeset: 3:65bd5f99a4a3
|
||||
tag: tip
|
||||
parent: 1:ef3a871183d7
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -94,7 +91,6 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
% before update 4, strip 3
|
||||
changeset: 4:443431ffac4f
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: e
|
||||
@ -126,7 +122,6 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
% before update 4, strip 2
|
||||
changeset: 4:443431ffac4f
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: e
|
||||
@ -134,7 +129,6 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
|
||||
% after update 4, strip 2
|
||||
changeset: 3:443431ffac4f
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: e
|
||||
@ -143,7 +137,6 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
% before update 4, strip 1
|
||||
changeset: 4:264128213d29
|
||||
tag: tip
|
||||
parent: 1:ef3a871183d7
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -153,7 +146,6 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
|
||||
% after update 4, strip 1
|
||||
changeset: 0:9ab35a2d17cb
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: a
|
||||
@ -166,7 +158,6 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
|
||||
$ hg log
|
||||
changeset: 4:264128213d29
|
||||
tag: tip
|
||||
parent: 1:ef3a871183d7
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -196,7 +187,6 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
$ hg parents
|
||||
changeset: 4:264128213d29
|
||||
tag: tip
|
||||
parent: 1:ef3a871183d7
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -229,7 +219,6 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
$ rm .hg/strip-backup/*
|
||||
$ hg log --graph
|
||||
o changeset: 4:264128213d29
|
||||
| tag: tip
|
||||
| parent: 1:ef3a871183d7
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -270,7 +259,6 @@ before strip of merge parent
|
||||
summary: d
|
||||
|
||||
changeset: 4:264128213d29
|
||||
tag: tip
|
||||
parent: 1:ef3a871183d7
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -296,7 +284,6 @@ after strip of merge parent
|
||||
1 other heads for branch "default"
|
||||
$ hg log -G
|
||||
@ changeset: 4:264128213d29
|
||||
| tag: tip
|
||||
| parent: 1:ef3a871183d7
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -329,7 +316,6 @@ after strip of merge parent
|
||||
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
|
||||
$ hg log -G
|
||||
@ changeset: 2:264128213d29
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: c
|
||||
@ -347,7 +333,6 @@ after strip of merge parent
|
||||
$ restore
|
||||
$ hg log -G
|
||||
o changeset: 4:443431ffac4f
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: e
|
||||
@ -388,7 +373,6 @@ Failed hook while applying "saveheads" bundle.
|
||||
$ restore
|
||||
$ hg log -G
|
||||
o changeset: 4:443431ffac4f
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: e
|
||||
@ -421,7 +405,6 @@ Failed hook while applying "saveheads" bundle.
|
||||
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
|
||||
$ hg log -G
|
||||
o changeset: 2:65bd5f99a4a3
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: d
|
||||
@ -659,8 +642,7 @@ initialization (previous repo is empty anyway)
|
||||
$ hg ci -m 'mergeCD'
|
||||
$ hg log -G
|
||||
@ changeset: 4:d8db9d137221
|
||||
|\ tag: tip
|
||||
| | parent: 2:5c51d8d6557d
|
||||
|\ parent: 2:5c51d8d6557d
|
||||
| | parent: 3:6625a5168474
|
||||
| | user: test
|
||||
| | date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -700,7 +682,6 @@ Check bundle behavior:
|
||||
summary: commitD
|
||||
|
||||
changeset: 4:d8db9d137221
|
||||
tag: tip
|
||||
parent: 2:5c51d8d6557d
|
||||
parent: 3:6625a5168474
|
||||
user: test
|
||||
@ -730,7 +711,6 @@ check strip behavior
|
||||
saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg
|
||||
$ hg log -G
|
||||
o changeset: 2:5c51d8d6557d
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: commitC
|
||||
@ -756,7 +736,6 @@ strip backup content
|
||||
summary: commitD
|
||||
|
||||
changeset: 4:d8db9d137221
|
||||
tag: tip
|
||||
parent: 2:5c51d8d6557d
|
||||
parent: 3:6625a5168474
|
||||
user: test
|
||||
|
||||
@ -102,7 +102,6 @@ Filename without "a/" or "b/" (issue5759):
|
||||
+a
|
||||
|
||||
changeset: 2:c60a6c753773
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: createb
|
||||
|
||||
@ -212,7 +212,7 @@ the merge tool goes to /dev/null because we're more interested in the results of
|
||||
> EOF
|
||||
|
||||
$ hg rebase -s . -d 3 --tool test
|
||||
rebasing b08445fd6b2a "c4" (tip)
|
||||
rebasing b08445fd6b2a "c4"
|
||||
merging a
|
||||
custom merge tool
|
||||
custom merge tool end
|
||||
|
||||
@ -28,9 +28,7 @@ sh % "hg merge" == r"""
|
||||
|
||||
# Test disabling the `hg tag` command:
|
||||
sh % "hg tag foo"
|
||||
sh % "hg tags" == r"""
|
||||
tip 1:9b0f5d3c138d
|
||||
foo 0:426bada5c675"""
|
||||
sh % "hg tags" == "foo 0:426bada5c675"
|
||||
sh % "setconfig 'ui.allowtags=False'"
|
||||
sh % "hg tag foo2" == r"""
|
||||
abort: new tags are disabled in this repository
|
||||
|
||||
@ -15,7 +15,6 @@ summary: commit1
|
||||
result: 0
|
||||
running: log -r tip
|
||||
changeset: 1:45589e459b2e
|
||||
tag: tip
|
||||
user: test
|
||||
date: Sun Jan 02 00:00:00 2000 +0000
|
||||
summary: commit2
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
|
||||
$ hg heads
|
||||
changeset: 2:a1cb177e0d44
|
||||
tag: tip
|
||||
parent: 0:1e1d9c4e5b64
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
|
||||
@ -77,7 +77,6 @@ sh % "hg -R a outgoing b" == r"""
|
||||
comparing with b
|
||||
searching for changes
|
||||
changeset: 4:1ec3c74fc0e0
|
||||
tag: tip
|
||||
parent: 1:79f9e10cd04e
|
||||
parent: 2:8e1bb01c1a24
|
||||
user: test
|
||||
@ -96,7 +95,6 @@ sh % "hg -R b outgoing c" == r"""
|
||||
comparing with c
|
||||
searching for changes
|
||||
changeset: 3:d15a0c284984
|
||||
tag: tip
|
||||
parent: 2:8e1bb01c1a24
|
||||
parent: 1:79f9e10cd04e
|
||||
user: test
|
||||
@ -106,7 +104,6 @@ sh % "hg -R c outgoing b" == r"""
|
||||
comparing with b
|
||||
searching for changes
|
||||
changeset: 3:1ec3c74fc0e0
|
||||
tag: tip
|
||||
parent: 1:79f9e10cd04e
|
||||
parent: 2:8e1bb01c1a24
|
||||
user: test
|
||||
|
||||
@ -44,7 +44,6 @@ hg log (ascii)
|
||||
|
||||
$ hg --encoding ascii log
|
||||
changeset: 3:ca661e7520de
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: utf-8 e' encoded: ?
|
||||
@ -69,7 +68,6 @@ hg log (latin-1)
|
||||
|
||||
$ hg --encoding latin-1 log
|
||||
changeset: 3:ca661e7520de
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: utf-8 e' encoded: \xe9 (esc)
|
||||
@ -94,7 +92,6 @@ hg log (utf-8)
|
||||
|
||||
$ hg --encoding utf-8 log
|
||||
changeset: 3:ca661e7520de
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: utf-8 e' encoded: \xc3\xa9 (esc)
|
||||
@ -118,35 +115,25 @@ hg log (utf-8)
|
||||
hg tags (ascii)
|
||||
|
||||
$ HGENCODING=ascii hg tags
|
||||
tip 3:ca661e7520de
|
||||
|
||||
hg tags (latin-1)
|
||||
|
||||
$ HGENCODING=latin-1 hg tags
|
||||
tip 3:ca661e7520de
|
||||
|
||||
hg tags (utf-8)
|
||||
|
||||
$ HGENCODING=utf-8 hg tags
|
||||
tip 3:ca661e7520de
|
||||
|
||||
hg tags (JSON)
|
||||
|
||||
$ hg tags -Tjson
|
||||
[
|
||||
{
|
||||
"node": "ca661e7520dec3f5438a63590c350bebadb04989",
|
||||
"rev": 3,
|
||||
"tag": "tip",
|
||||
"type": ""
|
||||
}
|
||||
]
|
||||
|
||||
hg log (utf-8)
|
||||
|
||||
$ HGENCODING=utf-8 hg log
|
||||
changeset: 3:ca661e7520de
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: utf-8 e' encoded: \xc3\xa9 (esc)
|
||||
|
||||
@ -74,7 +74,6 @@ Test adding .hgeol
|
||||
% hg status
|
||||
% hg tip -p
|
||||
changeset: 1:33503edb53b0
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:03:20 1970 +0000
|
||||
summary: Added .hgeol file
|
||||
@ -102,7 +101,6 @@ Test adding .hgeol
|
||||
% hg status
|
||||
% hg tip -p
|
||||
changeset: 1:6e64eaa9eb23
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:03:20 1970 +0000
|
||||
summary: Added .hgeol file
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
$ hg log
|
||||
changeset: 4:2ee31f665a86
|
||||
tag: tip
|
||||
parent: 1:96155394af80
|
||||
parent: 2:92cc4c306b19
|
||||
user: test
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
$ chmod +x a
|
||||
$ hg ci -m'executable'
|
||||
$ hg id
|
||||
79abf14474dc tip
|
||||
79abf14474dc
|
||||
|
||||
Make sure we notice the change of mode if the cached size == -1:
|
||||
|
||||
|
||||
@ -30,7 +30,6 @@ sh % 'hg commit -A -l "$TESTDIR/ctrlchar-msg.txt"' == r"""
|
||||
sh % 'hg commit -A -l "$TESTDIR/perfectlyok-msg.txt"' == "adding a"
|
||||
sh % "hg log -r ." == r"""
|
||||
changeset: 0:d9cf9881be7b
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: This commit message is perfectly OK, and has no sneaky control characters."""
|
||||
|
||||
@ -41,7 +41,7 @@ sh % "hg bookmark -i book-B"
|
||||
# Do the merge:
|
||||
|
||||
sh % "hg up -q $C"
|
||||
sh % "hg graft book-B" == 'grafting 4:b55db8435dc2 "B2" (tip book-B)'
|
||||
sh % "hg graft book-B" == 'grafting 4:b55db8435dc2 "B2" (book-B)'
|
||||
|
||||
sh % "hg status"
|
||||
sh % "hg log -r . -T '{desc}\\n' --stat" == r"""
|
||||
|
||||
@ -45,7 +45,7 @@ Check filename heuristics (same dirname and same basename)
|
||||
desc: initial, phase: public
|
||||
|
||||
$ hg rebase -s . -d 1
|
||||
rebasing 557f403c0afd "mod a, mod dir/file.txt" (tip)
|
||||
rebasing 557f403c0afd "mod a, mod dir/file.txt"
|
||||
merging b and a to b
|
||||
merging dir2/file.txt and dir/file.txt to dir2/file.txt
|
||||
$ cd ..
|
||||
@ -79,7 +79,7 @@ Make sure filename heuristics do not when they are not related
|
||||
desc: initial, phase: public
|
||||
|
||||
$ hg rebase -s . -d 1
|
||||
rebasing d526312210b9 "mode a" (tip)
|
||||
rebasing d526312210b9 "mode a"
|
||||
other [source] changed a which local [dest] deleted
|
||||
hint: if this is due to a renamed file, you can manually input the renamed path, or re-run the command using --config=experimental.copytrace=on to make hg figure out renamed path automatically (which is very slow, and you will need to be patient)
|
||||
use (c)hanged version, leave (d)eleted, or leave (u)nresolved, or input (r)enamed path? u
|
||||
@ -119,7 +119,7 @@ Test when lca didn't modified the file that was moved
|
||||
desc: initial, phase: public
|
||||
|
||||
$ hg rebase -s . -d 2
|
||||
rebasing 9d5cf99c3d9f "mod a" (tip)
|
||||
rebasing 9d5cf99c3d9f "mod a"
|
||||
merging b and a to b
|
||||
$ cd ..
|
||||
$ rm -rf server
|
||||
@ -155,7 +155,7 @@ Rebase "backwards"
|
||||
desc: initial, phase: public
|
||||
|
||||
$ hg rebase -s . -d 0
|
||||
rebasing fbe97126b396 "mod b" (tip)
|
||||
rebasing fbe97126b396 "mod b"
|
||||
merging a and b to a
|
||||
$ cd ..
|
||||
$ rm -rf server
|
||||
@ -183,7 +183,7 @@ Rebase draft commit on top of draft commit
|
||||
desc: initial, phase: draft
|
||||
|
||||
$ hg rebase -s . -d 1
|
||||
rebasing 5268f05aa168 "mod a" (tip)
|
||||
rebasing 5268f05aa168 "mod a"
|
||||
merging b and a to b
|
||||
$ cd ..
|
||||
$ rm -rf server
|
||||
@ -222,7 +222,7 @@ Check a few potential move candidates
|
||||
desc: initial, phase: public
|
||||
|
||||
$ hg rebase -s . -d 2
|
||||
rebasing 6b2f4cece40f "mod dir/a" (tip)
|
||||
rebasing 6b2f4cece40f "mod dir/a"
|
||||
merging dir/b and dir/a to dir/b
|
||||
$ cd ..
|
||||
$ rm -rf server
|
||||
@ -300,7 +300,7 @@ Too many move candidates
|
||||
desc: initial, phase: public
|
||||
|
||||
$ hg rebase -s 2 -d 1
|
||||
rebasing ef716627c70b "mod a" (tip)
|
||||
rebasing ef716627c70b "mod a"
|
||||
other [source] changed a which local [dest] deleted
|
||||
hint: if this is due to a renamed file, you can manually input the renamed path, or re-run the command using --config=experimental.copytrace=on to make hg figure out renamed path automatically (which is very slow, and you will need to be patient)
|
||||
use (c)hanged version, leave (d)eleted, or leave (u)nresolved, or input (r)enamed path? u
|
||||
@ -337,7 +337,7 @@ Move a directory in draft branch
|
||||
desc: initial, phase: public
|
||||
|
||||
$ hg rebase -s . -d 1
|
||||
rebasing a33d80b6e352 "mv dir/ dir2/" (tip)
|
||||
rebasing a33d80b6e352 "mv dir/ dir2/"
|
||||
merging dir/a and dir2/a to dir2/a
|
||||
$ cd ..
|
||||
$ rm -rf server
|
||||
@ -371,7 +371,7 @@ Move file twice and rebase mod on top of moves
|
||||
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
|
||||
desc: initial, phase: public
|
||||
$ hg rebase -s . -d 2
|
||||
rebasing d41316942216 "mod a" (tip)
|
||||
rebasing d41316942216 "mod a"
|
||||
merging c and a to c
|
||||
|
||||
$ cd ..
|
||||
@ -446,7 +446,7 @@ Move one file and add another file in the same folder in one branch, modify file
|
||||
desc: initial, phase: public
|
||||
|
||||
$ hg rebase -s . -d 2
|
||||
rebasing ef716627c70b "mod a" (tip)
|
||||
rebasing ef716627c70b "mod a"
|
||||
merging b and a to b
|
||||
$ ls
|
||||
b
|
||||
@ -517,7 +517,7 @@ Copy and move file
|
||||
desc: initial, phase: public
|
||||
|
||||
$ hg rebase -s . -d 1
|
||||
rebasing ef716627c70b "mod a" (tip)
|
||||
rebasing ef716627c70b "mod a"
|
||||
merging b and a to b
|
||||
merging c and a to c
|
||||
$ ls
|
||||
@ -646,7 +646,7 @@ changed in same move
|
||||
desc initial, phase: draft
|
||||
|
||||
$ hg rebase -s . -d 1 --config=experimental.copytrace=on
|
||||
rebasing 6207d2d318e7 "mod a" (tip)
|
||||
rebasing 6207d2d318e7 "mod a"
|
||||
merging dir2/b and dir1/a to dir2/b
|
||||
$ cat dir2/b
|
||||
a
|
||||
@ -683,7 +683,7 @@ while adding file to original directory in other merge parent. File moved on reb
|
||||
desc initial, phase: draft
|
||||
|
||||
$ hg rebase -s . -d 1 --config=experimental.copytrace=on
|
||||
rebasing e8919e7df8d0 "mv dir1 dir2" (tip)
|
||||
rebasing e8919e7df8d0 "mv dir1 dir2"
|
||||
$ ls dir2
|
||||
a
|
||||
dummy
|
||||
|
||||
@ -307,7 +307,7 @@ Test that rebasing applies the same change to both
|
||||
$ echo b > dir1/a
|
||||
$ hg commit --config extensions.dirsync=! -m "edit dir1/a with sync on"
|
||||
$ hg rebase --config extensions.rebase= -d 1
|
||||
rebasing 70b4edc7f658 "edit dir1/a with sync on" (tip)
|
||||
rebasing 70b4edc7f658 "edit dir1/a with sync on"
|
||||
mirrored changes in 'dir1/a' to 'dir2/a'
|
||||
$ hg diff --git -r ".^" -r .
|
||||
diff --git a/dir1/a b/dir1/a
|
||||
@ -346,7 +346,6 @@ Test committing part of the working copy
|
||||
A dir1/b
|
||||
$ hg log -r . --stat
|
||||
changeset: 0:9eb46ceb8af3
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: add dir1/a
|
||||
@ -363,7 +362,6 @@ Test committing part of the working copy
|
||||
A dir1/b
|
||||
$ hg log -r . --stat
|
||||
changeset: 1:50bf2325c501
|
||||
tag: tip
|
||||
parent: -1:000000000000
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -385,7 +383,6 @@ Test committing part of the working copy
|
||||
$ hg status
|
||||
$ hg log -r . --stat
|
||||
changeset: 2:5245011388b8
|
||||
tag: tip
|
||||
parent: -1:000000000000
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -593,7 +590,6 @@ Test .hgdirsync in the working copy
|
||||
mirrored adding 'dir5/b' to 'dir4/b'
|
||||
$ hg log -p -r .
|
||||
changeset: 0:1cde422b6101
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: init
|
||||
|
||||
@ -70,7 +70,7 @@ TEST: dropping changeset in the middle of the stack
|
||||
|
||||
$ hg drop -r 2
|
||||
Dropping changeset c175ba: r2
|
||||
rebasing c034855f2b01 "r3" (tip)
|
||||
rebasing c034855f2b01 "r3"
|
||||
merging mf
|
||||
$ hg log -G -T '{rev} {desc|firstline}'
|
||||
o 4 r3
|
||||
@ -123,7 +123,7 @@ TEST: dropping a changest with child changesets
|
||||
merging mf
|
||||
rebasing 4905937520ff "r6"
|
||||
merging mf
|
||||
rebasing 2c7cfba83429 "r7" (tip)
|
||||
rebasing 2c7cfba83429 "r7"
|
||||
merging mf
|
||||
$ hg log -G -T '{rev} {desc|firstline}'
|
||||
o 12 r7
|
||||
|
||||
@ -18,7 +18,7 @@ Simple Dependency
|
||||
ext2: uisetup
|
||||
ext1: extsetup
|
||||
ext2: extsetup
|
||||
000000000000 tip
|
||||
000000000000
|
||||
|
||||
$ cat >> .hg/hgrc << EOF
|
||||
> [extorder]
|
||||
@ -32,7 +32,7 @@ Simple Dependency
|
||||
ext2: uisetup
|
||||
ext2: extsetup
|
||||
ext1: extsetup
|
||||
000000000000 tip
|
||||
000000000000
|
||||
|
||||
Conflicting deps
|
||||
|
||||
|
||||
@ -696,7 +696,6 @@ create history with a filerev whose linkrev points to another branch
|
||||
$ echo W >> a
|
||||
$ hg log -G
|
||||
@ changeset: 4:072f1e8df249
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: contentC
|
||||
|
||||
@ -34,7 +34,6 @@ log before edit
|
||||
|
||||
$ hg log --graph
|
||||
@ changeset: 5:652413bf663e
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: f
|
||||
@ -82,7 +81,6 @@ exec & continue should not preserve hashes
|
||||
|
||||
$ hg log --graph
|
||||
@ changeset: 5:652413bf663e
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: f
|
||||
|
||||
@ -28,7 +28,6 @@ log before edit
|
||||
|
||||
$ hg log --graph
|
||||
@ changeset: 5:652413bf663e
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: f
|
||||
@ -76,7 +75,6 @@ exec & continue should not preserve hashes
|
||||
|
||||
$ hg log --graph
|
||||
@ changeset: 5:652413bf663e
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: f
|
||||
|
||||
@ -26,7 +26,6 @@ log before edit
|
||||
|
||||
$ hg log --graph
|
||||
@ changeset: 5:652413bf663e
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: f
|
||||
|
||||
@ -36,7 +36,6 @@ log before edit
|
||||
|
||||
$ hg log --graph
|
||||
@ changeset: 5:652413bf663e
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: f
|
||||
@ -82,7 +81,6 @@ stop & continue cannot preserve hashes without obsolescence
|
||||
|
||||
$ hg log --graph
|
||||
@ changeset: 7:794fe033d0a0
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: f
|
||||
|
||||
@ -33,7 +33,6 @@ log before edit
|
||||
|
||||
$ hg log --graph
|
||||
@ changeset: 5:652413bf663e
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: f
|
||||
@ -79,7 +78,6 @@ stop & continue cannot preserve hashes without obsolescence
|
||||
|
||||
$ hg log --graph
|
||||
@ changeset: 7:794fe033d0a0
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: f
|
||||
|
||||
@ -230,7 +230,7 @@ Test case 1: Source deleted, dest changed
|
||||
|
||||
|
||||
$ hg rebase -d 1 -s 2
|
||||
rebasing 25c2ef28f4c7 "source" (tip)
|
||||
rebasing 25c2ef28f4c7 "source"
|
||||
local [dest] changed file which other [source] deleted
|
||||
use (c)hanged version, (d)elete, or leave (u)nresolved? u
|
||||
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
||||
@ -738,7 +738,7 @@ mergestate (like shelve):
|
||||
$ hg unshelve
|
||||
unshelving change 'c'
|
||||
rebasing shelved changes
|
||||
rebasing b0582bede31d "shelve changes to: c" (tip)
|
||||
rebasing b0582bede31d "shelve changes to: c"
|
||||
merging b
|
||||
warning: 1 conflicts while merging b! (edit, then use 'hg resolve --mark')
|
||||
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
|
||||
|
||||
@ -159,7 +159,7 @@ changesets
|
||||
note: not rebasing 1a07332e9fa1 "add c", already in destination as d446b1b2be43 "add c"
|
||||
note: not rebasing ee96b78ae17d "add d", already in destination as 1f539cc6f364 "add d"
|
||||
note: not rebasing d5895ab36037 "add e", already in destination as 461a5b25b3dc "add e" (default/master master)
|
||||
rebasing 7dcd118e395a "add k" (tip)
|
||||
rebasing 7dcd118e395a "add k"
|
||||
|
||||
$ echo more >> k
|
||||
$ hg amend
|
||||
|
||||
@ -112,7 +112,6 @@ Apply a bundle on the second server via the command line
|
||||
new changesets a8078509f8d1
|
||||
$ hg log -r a8078509f8d1
|
||||
changeset: 2:a8078509f8d1
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: client push
|
||||
@ -148,7 +147,6 @@ Now try with correct file
|
||||
new changesets d85a52e5321a
|
||||
$ hg show d85a52e5321a
|
||||
changeset: 2:d85a52e5321a
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:03 1970 +0000
|
||||
files: client push
|
||||
@ -213,7 +211,6 @@ Apply stack
|
||||
|
||||
$ hg log -r 143d91ad57b2
|
||||
changeset: 4:143d91ad57b2
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:04 1970 +0000
|
||||
summary: stack push 2
|
||||
|
||||
@ -578,7 +578,6 @@ Test that the prepushrebase hook can run against the bundle repo
|
||||
pushing to ssh://user@dummy/prepushrebaseserver
|
||||
searching for changes
|
||||
remote: changeset: 1:0e067c57feba
|
||||
remote: tag: tip
|
||||
remote: user: test
|
||||
remote: date: Thu Jan 01 00:00:00 1970 +0000
|
||||
remote: summary: b
|
||||
|
||||
@ -219,7 +219,7 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
$ clearcache
|
||||
$ find $CACHEDIR -type f | sort
|
||||
$ hg rebase -s temporary -d foo
|
||||
rebasing 58147a5b5242 "b" (temporary tip)
|
||||
rebasing 58147a5b5242 "b" (temporary)
|
||||
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/58147a5b5242-c3678817-rebase.hg (glob)
|
||||
* files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob)
|
||||
$ sleep 1
|
||||
|
||||
@ -111,7 +111,6 @@
|
||||
|
||||
$ hg show
|
||||
changeset: 0:0d2948821b2b
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
files: x
|
||||
|
||||
@ -56,7 +56,7 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
b292c1e3311f
|
||||
|
||||
$ hg rebase -d 1
|
||||
rebasing 0632994590a8 "xx" (tip)
|
||||
rebasing 0632994590a8 "xx"
|
||||
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/0632994590a8-0bc786d8-rebase.hg (glob)
|
||||
$ hg log -f x --template "{node|short}\n"
|
||||
81deab2073bc
|
||||
@ -66,14 +66,14 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
# Rebase back, log -f still works
|
||||
|
||||
$ hg rebase -d 0 -r 2
|
||||
rebasing 81deab2073bc "xx" (tip)
|
||||
rebasing 81deab2073bc "xx"
|
||||
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/81deab2073bc-80cb4fda-rebase.hg (glob)
|
||||
$ hg log -f x --template "{node|short}\n"
|
||||
b3fca10fb42d
|
||||
b292c1e3311f
|
||||
|
||||
$ hg rebase -d 1 -r 2
|
||||
rebasing b3fca10fb42d "xx" (tip)
|
||||
rebasing b3fca10fb42d "xx"
|
||||
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/b3fca10fb42d-da73a0c7-rebase.hg (glob)
|
||||
|
||||
$ cd ..
|
||||
|
||||
@ -170,7 +170,6 @@ TODO: Make this test compatibile with obsstore enabled.
|
||||
|
||||
$ hg log -r 2 --stat
|
||||
changeset: 2:19edf50f4de7
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: a
|
||||
|
||||
@ -44,7 +44,6 @@ Log on a file without -f
|
||||
|
||||
$ hg log dir/y
|
||||
changeset: 1:79c51fb96423
|
||||
tag: tip
|
||||
bookmark: default/master
|
||||
hoistedname: master
|
||||
user: test
|
||||
@ -55,7 +54,6 @@ Log on a file with -f
|
||||
|
||||
$ hg log -f dir/y
|
||||
changeset: 1:79c51fb96423
|
||||
tag: tip
|
||||
bookmark: default/master
|
||||
hoistedname: master
|
||||
user: test
|
||||
@ -65,7 +63,6 @@ Log on a file with -f
|
||||
Log on a file with kind in path
|
||||
$ hg log -r "filelog('path:dir/y')"
|
||||
changeset: 1:79c51fb96423
|
||||
tag: tip
|
||||
bookmark: default/master
|
||||
hoistedname: master
|
||||
user: test
|
||||
@ -76,7 +73,6 @@ Log on multiple files with -f
|
||||
|
||||
$ hg log -f dir/y x
|
||||
changeset: 1:79c51fb96423
|
||||
tag: tip
|
||||
bookmark: default/master
|
||||
hoistedname: master
|
||||
user: test
|
||||
@ -92,7 +88,6 @@ Log on a directory
|
||||
|
||||
$ hg log dir
|
||||
changeset: 1:79c51fb96423
|
||||
tag: tip
|
||||
bookmark: default/master
|
||||
hoistedname: master
|
||||
user: test
|
||||
@ -104,7 +99,6 @@ Log on a file from inside a directory
|
||||
$ cd dir
|
||||
$ hg log y
|
||||
changeset: 1:79c51fb96423
|
||||
tag: tip
|
||||
bookmark: default/master
|
||||
hoistedname: master
|
||||
user: test
|
||||
|
||||
@ -176,7 +176,7 @@
|
||||
$ hg rebase -s $C -d $B
|
||||
rebasing e6011cdb8530 "C"
|
||||
merging foo
|
||||
rebasing f579bc04d2ae "D" (tip)
|
||||
rebasing f579bc04d2ae "D"
|
||||
merging foo
|
||||
|
||||
# Test compatibility with LFS
|
||||
|
||||
@ -45,7 +45,6 @@ as well
|
||||
default-push = ssh://user@dummy/repo?write
|
||||
$ hg log -r .
|
||||
changeset: 1:a89d614e2364
|
||||
tag: tip
|
||||
bookmark: default/master
|
||||
hoistedname: master
|
||||
user: test
|
||||
@ -64,7 +63,6 @@ as well
|
||||
updating bookmark master
|
||||
$ hg log -r .
|
||||
changeset: 2:421535db10b6
|
||||
tag: tip
|
||||
bookmark: default/master
|
||||
hoistedname: master
|
||||
user: test
|
||||
@ -77,7 +75,6 @@ as well
|
||||
no changes found
|
||||
$ hg log -r .
|
||||
changeset: 2:421535db10b6
|
||||
tag: tip
|
||||
bookmark: default/master
|
||||
hoistedname: master
|
||||
user: test
|
||||
|
||||
@ -170,7 +170,7 @@ the server supports our custom getfiles method.
|
||||
|
||||
$ cd ../master
|
||||
$ hg log -l 1 --style compact
|
||||
3[tip] 1489bbbc46f0 1970-01-01 00:00 +0000 test
|
||||
3 1489bbbc46f0 1970-01-01 00:00 +0000 test
|
||||
a
|
||||
|
||||
$ hg up
|
||||
|
||||
@ -38,7 +38,6 @@
|
||||
$ ls .hg/store/data
|
||||
~2ehgtags.i
|
||||
$ hg tags
|
||||
tip 1:6ce44dcfda68
|
||||
tag1 0:e0360bc0d9e1
|
||||
$ hg update
|
||||
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
@ -58,7 +57,6 @@
|
||||
added 1 changesets with 0 changes to 0 files
|
||||
new changesets 6a22dfa4fd34
|
||||
$ hg tags
|
||||
tip 2:6a22dfa4fd34
|
||||
tag2 1:6ce44dcfda68
|
||||
tag1 0:e0360bc0d9e1
|
||||
$ hg update
|
||||
@ -69,7 +67,6 @@
|
||||
|
||||
$ hg log -l 1 --stat
|
||||
changeset: 2:6a22dfa4fd34
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: Added tag tag2 for changeset 6ce44dcfda68
|
||||
|
||||
@ -41,8 +41,7 @@
|
||||
$ hg --cwd ../master log -G -l 1 --stat
|
||||
o changeset: 1:6b73ab2c9773
|
||||
| bookmark: master
|
||||
~ tag: tip
|
||||
user: test
|
||||
~ user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: Modify dir/x
|
||||
|
||||
|
||||
@ -58,7 +58,7 @@ Test basic repo behaviors
|
||||
|
||||
Test rebase
|
||||
$ cmd hg rebase -d 775bfdd --config "extensions.rebase="
|
||||
rebasing 4b6cc7d5194b "c3" (active tip)
|
||||
rebasing 4b6cc7d5194b "c3" (active)
|
||||
merging b
|
||||
warning: 1 conflicts while merging b! (edit, then use 'hg resolve --mark')
|
||||
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
||||
@ -124,7 +124,7 @@ Test unshelve
|
||||
$ cmd hg unshelve --config "extensions.shelve="
|
||||
unshelving change 'default'
|
||||
rebasing shelved changes
|
||||
rebasing 19f7fec7f80b "shelve changes to: c3" (tip)
|
||||
rebasing 19f7fec7f80b "shelve changes to: c3"
|
||||
other [source] changed b which local [dest] deleted
|
||||
use (c)hanged version, leave (d)eleted, leave (u)nresolved, or input (r)enamed path? u
|
||||
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
|
||||
|
||||
@ -82,7 +82,6 @@ Test that output remains the same with multiple invocations.
|
||||
got value for key buildstatus:a5d935fe38ada2b984c29e4e02bffd7f19bf818d:b292c1e3311fd0f13ae83b409caae4a6d1fb348c:v2 from local
|
||||
changeset: 1:a5d935fe38ada2b984c29e4e02bffd7f19bf818d
|
||||
bookmark: foo
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 0:b292c1e3311fd0f13ae83b409caae4a6d1fb348c
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
@ -112,7 +111,6 @@ Test that output remains the same with multiple invocations.
|
||||
$ hg log -vp -r .
|
||||
changeset: 1:a5d935fe38ad
|
||||
bookmark: foo
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
files: x y
|
||||
@ -169,7 +167,6 @@ Test that corrupt caches are gracefully ignored, and updated
|
||||
got value for key buildstatus:a5d935fe38ada2b984c29e4e02bffd7f19bf818d:b292c1e3311fd0f13ae83b409caae4a6d1fb348c:v2 from local
|
||||
changeset: 1:a5d935fe38ada2b984c29e4e02bffd7f19bf818d
|
||||
bookmark: foo
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 0:b292c1e3311fd0f13ae83b409caae4a6d1fb348c
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
@ -226,7 +223,6 @@ Test strange (unicode) filenames
|
||||
got value for key buildstatus:f3a143469693894d291b7388ea8392a07492751f:a5d935fe38ada2b984c29e4e02bffd7f19bf818d:v2 from local
|
||||
changeset: 2:f3a143469693894d291b7388ea8392a07492751f
|
||||
bookmark: foo
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 1:a5d935fe38ada2b984c29e4e02bffd7f19bf818d
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
|
||||
@ -35,7 +35,7 @@ Prepare a repo for rebase checks
|
||||
$ echo b > b && hg ci -Am b # rev 5
|
||||
adding b
|
||||
$ hg rebase --hidden -r 5 -d 1 # rev 6
|
||||
rebasing 1e9a3c00cbe9 "b" (tip)
|
||||
rebasing 1e9a3c00cbe9 "b"
|
||||
$ hg rebase --hidden -r 5 -d 2 # rev 7
|
||||
rebasing 1e9a3c00cbe9 "b"
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ Continue repo setup
|
||||
|
||||
$ hg phase -r master --public
|
||||
$ hg log -G -T compact
|
||||
@ 5[tip][feature2] db92053d5c83 1970-01-01 00:00 +0000 test
|
||||
@ 5[feature2] db92053d5c83 1970-01-01 00:00 +0000 test
|
||||
| d
|
||||
|
|
||||
o 4[master] 38d85b506754 1970-01-01 00:00 +0000 test
|
||||
@ -53,7 +53,7 @@ Continue repo setup
|
||||
|
||||
Basic test
|
||||
$ hg smartlog -T compact
|
||||
@ 5[tip][feature2] db92053d5c83 1970-01-01 00:00 +0000 test
|
||||
@ 5[feature2] db92053d5c83 1970-01-01 00:00 +0000 test
|
||||
| d
|
||||
|
|
||||
o 4[master] 38d85b506754 1970-01-01 00:00 +0000 test
|
||||
@ -69,7 +69,7 @@ Basic test
|
||||
With commit info
|
||||
$ echo "hello" >c2 && hg ci --amend
|
||||
$ hg smartlog -T compact --commit-info
|
||||
@ 6[tip][feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
@ 6[feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| d
|
||||
|
|
||||
| M c2
|
||||
@ -87,7 +87,7 @@ With commit info
|
||||
|
||||
As a revset
|
||||
$ hg log -G -T compact -r 'smartlog()'
|
||||
@ 6[tip][feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
@ 6[feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| d
|
||||
|
|
||||
o 4[master] 38d85b506754 1970-01-01 00:00 +0000 test
|
||||
@ -105,7 +105,7 @@ With --master
|
||||
$ hg phase -r 1 --public
|
||||
|
||||
$ hg smartlog -T compact --master 1
|
||||
@ 6[tip][feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
@ 6[feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| d
|
||||
|
|
||||
o 4[master] 38d85b506754 1970-01-01 00:00 +0000 test
|
||||
@ -136,7 +136,7 @@ Specific revs
|
||||
|
|
||||
|
||||
$ hg smartlog -T compact -r 'smartlog()' -r 0
|
||||
@ 6[tip][feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
@ 6[feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| d
|
||||
|
|
||||
o 4[master] 38d85b506754 1970-01-01 00:00 +0000 test
|
||||
@ -161,7 +161,7 @@ Test master ordering
|
||||
o 2[feature1,master] 49cdb4091aca 1970-01-01 00:00 +0000 test
|
||||
| b
|
||||
|
|
||||
| @ 6[tip][feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| @ 6[feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| | d
|
||||
| |
|
||||
| o 4 38d85b506754 1970-01-01 00:00 +0000 test
|
||||
@ -180,7 +180,7 @@ Test overriding master
|
||||
|
||||
$ hg boo -f master -r 38d85b506754
|
||||
$ hg smartlog -T compact
|
||||
@ 6[tip][feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
@ 6[feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| d
|
||||
|
|
||||
o 4[master] 38d85b506754 1970-01-01 00:00 +0000 test
|
||||
@ -200,7 +200,7 @@ Test overriding master
|
||||
o 2[feature1] 49cdb4091aca 1970-01-01 00:00 +0000 test
|
||||
| b
|
||||
|
|
||||
| @ 6[tip][feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| @ 6[feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| | d
|
||||
| |
|
||||
| o 4[master] 38d85b506754 1970-01-01 00:00 +0000 test
|
||||
@ -217,7 +217,7 @@ Test overriding master
|
||||
o 2[feature1] 49cdb4091aca 1970-01-01 00:00 +0000 test
|
||||
| b
|
||||
|
|
||||
| @ 6[tip][feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| @ 6[feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| | d
|
||||
| |
|
||||
| o 4[master] 38d85b506754 1970-01-01 00:00 +0000 test
|
||||
@ -234,7 +234,7 @@ Test overriding master
|
||||
o 2[feature1] 49cdb4091aca 1970-01-01 00:00 +0000 test
|
||||
| b
|
||||
|
|
||||
| @ 6[tip][feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| @ 6[feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| | d
|
||||
| |
|
||||
| o 4[master] 38d85b506754 1970-01-01 00:00 +0000 test
|
||||
@ -254,7 +254,7 @@ Test with weird bookmark names
|
||||
|
||||
$ hg book -r 2 foo-bar
|
||||
$ hg smartlog -r 'foo-bar + .' -T compact
|
||||
@ 6[tip][feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
@ 6[feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
. d
|
||||
.
|
||||
| o 2[feature1,foo-bar] 49cdb4091aca 1970-01-01 00:00 +0000 test
|
||||
@ -271,7 +271,7 @@ Test with weird bookmark names
|
||||
o 2[feature1,foo-bar] 49cdb4091aca 1970-01-01 00:00 +0000 test
|
||||
| b
|
||||
|
|
||||
| @ 6[tip][feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| @ 6[feature2]:4 05d10250273e 1970-01-01 00:00 +0000 test
|
||||
| | d
|
||||
| |
|
||||
| o 4[master] 38d85b506754 1970-01-01 00:00 +0000 test
|
||||
@ -299,7 +299,7 @@ Test with two unrelated histories
|
||||
$ touch u2 && hg add u2 && hg ci -mu2
|
||||
|
||||
$ hg smartlog -T compact
|
||||
@ 8[tip] 806aaef35296 1970-01-01 00:00 +0000 test
|
||||
@ 8 806aaef35296 1970-01-01 00:00 +0000 test
|
||||
| u2
|
||||
|
|
||||
o 7:-1 8749dc393678 1970-01-01 00:00 +0000 test
|
||||
@ -334,7 +334,7 @@ Test singlepublicsuccessor template keyword
|
||||
$ echo c > c && hg ci -Am c
|
||||
adding c
|
||||
$ hg rebase -s 2 -d 1
|
||||
rebasing d36c0562f908 "c" (tip)
|
||||
rebasing d36c0562f908 "c"
|
||||
$ hg phase -r 3 --public
|
||||
$ hg smartlog -r 2 -T "SPS: {singlepublicsuccessor}" --hidden
|
||||
x SPS: 2b5806c2ca1e228838315bbffeb7d1504c38c9d6
|
||||
@ -351,7 +351,7 @@ A draft stack at the top
|
||||
$ hg bookmark master -r 1
|
||||
$ hg phase --public -r 1
|
||||
$ hg smartlog -T compact --all
|
||||
o 3[tip] 2dc09a01254d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
o 3 2dc09a01254d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
| r3
|
||||
|
|
||||
o 2 01241442b3c2 1970-01-01 00:00 +0000 debugbuilddag
|
||||
@ -361,7 +361,7 @@ A draft stack at the top
|
||||
| r1
|
||||
|
|
||||
$ hg smartlog -T compact --all --config smartlog.indentnonpublic=1
|
||||
o 3[tip] 2dc09a01254d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
o 3 2dc09a01254d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
| r3
|
||||
|
|
||||
o 2 01241442b3c2 1970-01-01 00:00 +0000 debugbuilddag
|
||||
@ -382,7 +382,6 @@ Different number of lines per node
|
||||
|
|
||||
$ hg smartlog -T 'default' --all --config smartlog.indentnonpublic=1
|
||||
o changeset: 3:2dc09a01254d
|
||||
| tag: tip
|
||||
| user: debugbuilddag
|
||||
| date: Thu Jan 01 00:00:03 1970 +0000
|
||||
| summary: r3
|
||||
@ -415,7 +414,7 @@ Add other draft stacks
|
||||
o 4:1 8d92afe5abfd 1970-01-01 00:00 +0000 test
|
||||
/ a
|
||||
|
|
||||
| @ 6[tip]:2 401cd6213b51 1970-01-01 00:00 +0000 test
|
||||
| @ 6:2 401cd6213b51 1970-01-01 00:00 +0000 test
|
||||
| | b
|
||||
| |
|
||||
| | o 3 2dc09a01254d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
@ -442,7 +441,7 @@ Recent arg select days correctly
|
||||
|
||||
|
||||
$ hg log -Gr 'smartlog((date(-25) & draft()) + .)' -T compact
|
||||
o 7[tip] * (glob)
|
||||
o 7 * (glob)
|
||||
| test2
|
||||
|
|
||||
o 6:2 401cd6213b51 1970-01-01 00:00 +0000 test
|
||||
@ -465,7 +464,7 @@ Make sure public commits that are descendants of master are not drawn
|
||||
$ hg bookmark master -r 1
|
||||
$ hg phase --public -r 1
|
||||
$ hg smartlog -T compact --all --config smartlog.indentnonpublic=1
|
||||
o 4[tip] bebd167eb94d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
o 4 bebd167eb94d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
| r4
|
||||
|
|
||||
o 3 2dc09a01254d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
@ -480,7 +479,7 @@ Make sure public commits that are descendants of master are not drawn
|
||||
$ hg phase -r 3 --public --force
|
||||
$ hg up -q 4
|
||||
$ hg smartlog -T compact --all --config smartlog.indentnonpublic=1
|
||||
@ 4[tip] bebd167eb94d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
@ 4 bebd167eb94d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
/ r4
|
||||
|
|
||||
o 3 2dc09a01254d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
@ -491,7 +490,7 @@ Make sure public commits that are descendants of master are not drawn
|
||||
|
|
||||
$ hg phase -r 4 --public --force
|
||||
$ hg smartlog -T compact --all --config smartlog.indentnonpublic=1
|
||||
@ 4[tip] bebd167eb94d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
@ 4 bebd167eb94d 1970-01-01 00:00 +0000 debugbuilddag
|
||||
. r4
|
||||
.
|
||||
o 1[master] 66f7d451a68b 1970-01-01 00:00 +0000 debugbuilddag
|
||||
|
||||
@ -215,7 +215,6 @@
|
||||
|
||||
$ hg snapshot show "$HOID"
|
||||
changeset: 11:03d785189d28
|
||||
tag: tip
|
||||
parent: 3:ffb8db6e9ac3
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -233,7 +232,6 @@
|
||||
|
||||
$ hg show --hidden "$HOID"
|
||||
changeset: 11:03d785189d28
|
||||
tag: tip
|
||||
parent: 3:ffb8db6e9ac3
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -283,7 +281,6 @@
|
||||
| summary: draft1 amend2
|
||||
|
|
||||
| s changeset: 11:03d785189d28
|
||||
| | tag: tip
|
||||
| | parent: 3:ffb8db6e9ac3
|
||||
| | user: test
|
||||
| | date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -410,7 +407,6 @@
|
||||
| summary: draft1 amend2
|
||||
|
|
||||
| s changeset: 11:03d785189d28
|
||||
| | tag: tip
|
||||
| | parent: 3:ffb8db6e9ac3
|
||||
| | user: test
|
||||
| | date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -455,7 +451,6 @@
|
||||
summary: snapshot
|
||||
|
||||
changeset: 11:03d785189d28
|
||||
tag: tip
|
||||
parent: 3:ffb8db6e9ac3
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
|
||||
@ -77,7 +77,6 @@
|
||||
7917335ca0064e431e045fdebf0bd483fcc8e28d
|
||||
$ hg snapshot show --debug $OID1
|
||||
changeset: 1:7917335ca0064e431e045fdebf0bd483fcc8e28d
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 0:df4f53cec30af1e4f669102135076fd4f9673fcc
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
@ -108,7 +107,6 @@
|
||||
5e55990d984329c0cd0395dad5fcee6d6e8cc126
|
||||
$ hg snapshot show --debug $OID2
|
||||
changeset: 1:5e55990d984329c0cd0395dad5fcee6d6e8cc126
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 0:df4f53cec30af1e4f669102135076fd4f9673fcc
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
@ -178,7 +176,6 @@
|
||||
7917335ca006 snapshot
|
||||
$ hg snapshot show --debug "$OID1"
|
||||
changeset: 2:7917335ca0064e431e045fdebf0bd483fcc8e28d
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 0:df4f53cec30af1e4f669102135076fd4f9673fcc
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
@ -246,7 +243,6 @@
|
||||
|
||||
$ hg snapshot show --debug "$OID2"
|
||||
changeset: 2:5e55990d984329c0cd0395dad5fcee6d6e8cc126
|
||||
tag: tip
|
||||
phase: draft
|
||||
parent: 0:df4f53cec30af1e4f669102135076fd4f9673fcc
|
||||
parent: -1:0000000000000000000000000000000000000000
|
||||
|
||||
@ -89,7 +89,6 @@
|
||||
# The snapshot commit is hidden
|
||||
$ hg log --hidden -r "hidden() & $EMPTYOID"
|
||||
changeset: 1:bd8d77aecb3d
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: first snapshot
|
||||
|
||||
@ -313,7 +313,7 @@ manifest for commit 'f7febcf0f689'.
|
||||
- Test rebasing of the flat ony commits works as expected.
|
||||
|
||||
$ hg rebase -d '9055b56f3916' -s '3795bd66ca70'
|
||||
rebasing 3795bd66ca70 "flat only commit 1 over flat only commit 2 at level 2" (tip)
|
||||
rebasing 3795bd66ca70 "flat only commit 1 over flat only commit 2 at level 2"
|
||||
fetching tree '' 40f43426c87ba597f0d9553077c72fe06d4e2acb, based on 85b359fdb09e9b8d7ac4a74551612b277345e8fd, found via 9055b56f3916
|
||||
transaction abort!
|
||||
rollback completed
|
||||
|
||||
@ -86,7 +86,6 @@ Pull a non-tree scratch branch into a normal client
|
||||
$ hg log -r tip -vp
|
||||
changeset: 2:ebde88dba372
|
||||
bookmark: scratch/nontree
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
files: bar/car
|
||||
@ -136,7 +135,6 @@ Pull just part of a treeonly scratch branch (this causes rebundling on the serve
|
||||
new changesets 02c12aef64ff
|
||||
$ hg log -r 02c12aef64ff --stat
|
||||
changeset: 1:02c12aef64ff
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: add subdir/a
|
||||
@ -158,7 +156,6 @@ Pull a treeonly scratch branch into a treeonly client (non-rebundling)
|
||||
$ hg log -G
|
||||
o changeset: 2:5a7a7de8a420
|
||||
| bookmark: scratch/foo
|
||||
| tag: tip
|
||||
| user: test
|
||||
| date: Thu Jan 01 00:00:00 1970 +0000
|
||||
| summary: edit subdir/a
|
||||
@ -189,7 +186,6 @@ Pull just part of a normal scratch branch (this causes rebundling on the server)
|
||||
new changesets 3ef288300b64
|
||||
$ hg log -r 3ef288300b64 --stat
|
||||
changeset: 3:3ef288300b64
|
||||
tag: tip
|
||||
parent: 0:085784c01c08
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -235,7 +231,6 @@ Verify its not on the server
|
||||
$ cd master
|
||||
$ hg log -G
|
||||
@ changeset: 0:085784c01c08
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: add x
|
||||
|
||||
@ -67,7 +67,7 @@ This file tests that normal mercurial operations never read the flat manifests
|
||||
|
||||
$ echo a >> b && hg commit -Aqm 'modify b'
|
||||
$ hg rebase -d 1 -r 2
|
||||
rebasing 667a26a14261 "modify b" (tip)
|
||||
rebasing 667a26a14261 "modify b"
|
||||
fetching tree '' 9486c937c5894f8f2adbaa0b589e8df5022217c9, based on 5ce27016a79d253c34c64aebd35bfb09605ad3ee, found via 77dc854aeab9
|
||||
1 trees fetched over * (glob)
|
||||
saved backup bundle to $TESTTMP/client/.hg/strip-backup/667a26a14261-d769c687-rebase.hg (glob)
|
||||
|
||||
@ -232,7 +232,6 @@ Test auto prefetch during normal access
|
||||
fetching tree '' 60a7f7acb6bb5aaf93ca7d9062931b0f6a0d6db5, based on 1be4ab2126dd2252dcae6be2aac2561dd3ddcda0, found via bd6f9b289c01
|
||||
2 trees fetched over * (glob)
|
||||
changeset: 2:bd6f9b289c01
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: modify x
|
||||
|
||||
@ -63,7 +63,6 @@
|
||||
updating bookmark master
|
||||
$ hg log -r .
|
||||
changeset: 2:0b41a6a811a2
|
||||
tag: tip
|
||||
bookmark: default/master
|
||||
hoistedname: master
|
||||
user: test
|
||||
@ -85,7 +84,6 @@
|
||||
default-push = ssh://user@dummy/repo?write
|
||||
$ hg log -r .
|
||||
changeset: 1:a89d614e2364
|
||||
tag: tip
|
||||
bookmark: default/master
|
||||
hoistedname: master
|
||||
user: test
|
||||
@ -96,7 +94,6 @@
|
||||
$ hg commit -qAm x4
|
||||
$ hg log -r .
|
||||
changeset: 2:e68715a0fc4c
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: x4
|
||||
@ -122,7 +119,6 @@
|
||||
obsoleted 1 changesets
|
||||
$ hg log -r .
|
||||
changeset: 4:12f14bedbd28
|
||||
tag: tip
|
||||
bookmark: default/master
|
||||
hoistedname: master
|
||||
user: test
|
||||
|
||||
@ -153,7 +153,6 @@ Tree-only amend
|
||||
Test looking at the tree from inside the bundle
|
||||
$ hg log -r tip -vp -R $TESTTMP/client/.hg/strip-backup/43903a6bf43f-712cb952-amend.hg --pager=off
|
||||
changeset: 4:43903a6bf43f
|
||||
tag: tip
|
||||
parent: 0:d618f764f9a1
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -183,7 +182,6 @@ Test unbundling the original commit
|
||||
\s*12 (re)
|
||||
$ hg log -r tip --stat
|
||||
changeset: 4:43903a6bf43f
|
||||
tag: tip
|
||||
parent: 0:d618f764f9a1
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -217,7 +215,6 @@ Test pulling new commits from a hybrid server
|
||||
fetching tree '' 7e265a5dc5229c2b237874c6bd19f6ef4120f949, based on 5fbe397e5ac6cb7ee263c5c67613c4665306d143* (glob)
|
||||
2 trees fetched over * (glob)
|
||||
changeset: 5:098a163f13ea
|
||||
tag: tip
|
||||
parent: 0:d618f764f9a1
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -427,7 +424,6 @@ Test pushing to a hybrid server w/ pushrebase w/o hooks
|
||||
- Verify the manifest data is accessible
|
||||
$ hg log -r tip --stat
|
||||
changeset: 2:dad1be784127
|
||||
tag: tip
|
||||
parent: 0:d618f764f9a1
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
@ -548,7 +544,6 @@ Test pushing from a treeonly client to a treeonly server *without* pushrebase
|
||||
4 176 44 -1 7 d20854ad7783 f4c373af9a41 000000000000
|
||||
$ hg -R ../master log -r tip --stat
|
||||
changeset: 7:5f0bc1aaff22
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: pushable treeonly commit
|
||||
@ -571,7 +566,6 @@ Test pushing from a public treeonly client to a treeonly server *with* pushrebas
|
||||
remote: added 4 changesets with 4 changes to 2 files
|
||||
$ hg -R ../master log -r tip --stat
|
||||
changeset: 7:5f0bc1aaff22
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: pushable treeonly commit
|
||||
@ -648,7 +642,6 @@ Test creating a treeonly repo from scratch
|
||||
$ hg commit -Aqm 'add a'
|
||||
$ hg log -r . -p
|
||||
changeset: 0:f87d03aef498
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: add a
|
||||
|
||||
@ -105,7 +105,7 @@ Test rebasing a stack of commits results in a pack with all the trees
|
||||
rebasing 6a2476258ba5 "modify subdir/y"
|
||||
fetching tree '' bc0c2c938b929f98b1c31a8c5994396ebb096bf0, based on 70f2c6726cec346b70b4f2ea65d0e2b9e1092a66
|
||||
1 trees fetched over * (glob)
|
||||
rebasing f096b21e165f "modify subdir/y again" (tip)
|
||||
rebasing f096b21e165f "modify subdir/y again"
|
||||
saved backup bundle to $TESTTMP/client/.hg/strip-backup/6a2476258ba5-a90056a1-rebase.hg (glob)
|
||||
$ hg log -r '.^::.' -T '{manifest}\n'
|
||||
0d05c20bb7eb53dbfe91f834ed3f0c26ca6ca655
|
||||
|
||||
@ -29,7 +29,7 @@ Check rebase metadata
|
||||
$ echo b > b && hg ci -Am b
|
||||
adding b
|
||||
$ hg rebase -r . -d destination
|
||||
rebasing 1e9a3c00cbe9 "b" (tip)
|
||||
rebasing 1e9a3c00cbe9 "b"
|
||||
$ hg debugobsolete
|
||||
09d39afb522a08bdb03dc231608f7a3488ab4edc * 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} (glob)
|
||||
* * 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'test'} (glob)
|
||||
|
||||
@ -34,5 +34,5 @@ sh % "touch c"
|
||||
sh % "hg commit -Aqm c"
|
||||
sh % "hg bookmark C -t AB"
|
||||
sh % "hg rebase" == r"""
|
||||
rebasing d5e255ef74f8 "c" (C tip)
|
||||
rebasing d5e255ef74f8 "c" (C)
|
||||
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5e255ef74f8-7d2cc323-rebase.hg"""
|
||||
|
||||
@ -51,13 +51,13 @@ Test that hg pull --rebase aborts without --dest
|
||||
pulling from $TESTTMP/repo (glob)
|
||||
searching for changes
|
||||
no changes found
|
||||
rebasing 3de6bbccf693 "foo" (bm tip)
|
||||
rebasing 3de6bbccf693 "foo" (bm)
|
||||
saved backup bundle to $TESTTMP/clone/.hg/strip-backup/3de6bbccf693-0dce0663-rebase.hg (glob)
|
||||
$ hg pull --rebase --dest three
|
||||
pulling from $TESTTMP/repo (glob)
|
||||
searching for changes
|
||||
no changes found
|
||||
rebasing 54ac787ff1c5 "foo" (bm tip)
|
||||
rebasing 54ac787ff1c5 "foo" (bm)
|
||||
saved backup bundle to $TESTTMP/clone/.hg/strip-backup/54ac787ff1c5-4c2ca3a1-rebase.hg (glob)
|
||||
|
||||
Test that hg pull --update aborts without --dest
|
||||
@ -93,7 +93,7 @@ Test that setting a defaultdest allows --update and --rebase to work
|
||||
pulling from $TESTTMP/repo (glob)
|
||||
searching for changes
|
||||
no changes found
|
||||
rebasing 50f3f60b4841 "d" (tip)
|
||||
rebasing 50f3f60b4841 "d"
|
||||
saved backup bundle to * (glob)
|
||||
$ hg log -G --all -T '{node|short} {bookmarks} {remotenames}'
|
||||
@ ba0f83735c95
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user