##// END OF EJS Templates
Make hg update more verbose by default (issue12)...
Make hg update more verbose by default (issue12) (including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.

File last commit:

r2175:b2ae81a7 default
r2175:b2ae81a7 default
Show More
test-hook.out
135 lines | 5.4 KiB | text/plain | TextLexer
Vadim Gelfer
i forgot to change the test output for test-hook.
r1735 precommit hook: p1=0000000000000000000000000000000000000000 p2=
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 pretxncommit hook: n=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p1=0000000000000000000000000000000000000000 p2=
0:29b62aeb769f
commit hook: n=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p1=0000000000000000000000000000000000000000 p2=
Vadim Gelfer
i forgot to change the test output for test-hook.
r1735 commit hook b
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 precommit hook: p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
pretxncommit hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
1:b702efe96888
commit hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
Vadim Gelfer
i forgot to change the test output for test-hook.
r1735 commit hook b
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 precommit hook: p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
pretxncommit hook: n=1324a5531bac09b329c3845d35ae6a7526874edb p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
2:1324a5531bac
commit hook: n=1324a5531bac09b329c3845d35ae6a7526874edb p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
Vadim Gelfer
i forgot to change the test output for test-hook.
r1735 commit hook b
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 precommit hook: p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2
pretxncommit hook: n=4c52fb2e402287dd5dc052090682536c8406c321 p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2
3:4c52fb2e4022
commit hook: n=4c52fb2e402287dd5dc052090682536c8406c321 p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2
Vadim Gelfer
i forgot to change the test output for test-hook.
r1735 commit hook b
prechangegroup hook
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 changegroup hook: n=b702efe9688826e3a91283852b328b84dbf37bc2
incoming hook: n=b702efe9688826e3a91283852b328b84dbf37bc2
incoming hook: n=1324a5531bac09b329c3845d35ae6a7526874edb
incoming hook: n=4c52fb2e402287dd5dc052090682536c8406c321
Vadim Gelfer
i forgot to change the test output for test-hook.
r1735 pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
(run 'hg update' to get a working copy)
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 pretag hook: t=a n=4c52fb2e402287dd5dc052090682536c8406c321 l=0
precommit hook: p1=4c52fb2e402287dd5dc052090682536c8406c321 p2=
pretxncommit hook: n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p1=4c52fb2e402287dd5dc052090682536c8406c321 p2=
4:4f92e785b90a
commit hook: n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p1=4c52fb2e402287dd5dc052090682536c8406c321 p2=
Matt Mackall
Change test-hook to test multiple hooks
r1481 commit hook b
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 tag hook: t=a n=4c52fb2e402287dd5dc052090682536c8406c321 l=0
pretag hook: t=la n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 l=1
tag hook: t=la n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 l=1
pretag hook: t=fa n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 l=0
Vadim Gelfer
i forgot to change the test output for test-hook.
r1735 pretag.forbid hook
abort: pretag.forbid hook exited with status 1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 pretag hook: t=fla n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 l=1
Vadim Gelfer
i forgot to change the test output for test-hook.
r1735 pretag.forbid hook
abort: pretag.forbid hook exited with status 1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 4:4f92e785b90a
precommit hook: p1=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p2=
pretxncommit hook: n=7792358308a2026661cea44f9d47c072813004cb p1=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p2=
5:7792358308a2
pretxncommit.forbid hook: tip=5:7792358308a2
Vadim Gelfer
i forgot to change the test output for test-hook.
r1735 abort: pretxncommit.forbid hook exited with status 1
transaction abort!
rollback completed
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 4:4f92e785b90a
precommit hook: p1=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p2=
Vadim Gelfer
i forgot to change the test output for test-hook.
r1735 precommit.forbid hook
abort: precommit.forbid hook exited with status 1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 4:4f92e785b90a
3:4c52fb2e4022
Vadim Gelfer
i forgot to change the test output for test-hook.
r1735 prechangegroup.forbid hook
pulling from ../a
searching for changes
abort: prechangegroup.forbid hook exited with status 1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 pretxnchangegroup.forbid hook: tip=4:4f92e785b90a
Vadim Gelfer
i forgot to change the test output for test-hook.
r1735 pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
abort: pretxnchangegroup.forbid hook exited with status 1
transaction abort!
rollback completed
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 3:4c52fb2e4022
Vadim Gelfer
add preoutgoing and outgoing hooks....
r1736 preoutgoing hook: s=pull
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 outgoing hook: n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 s=pull
Vadim Gelfer
add preoutgoing and outgoing hooks....
r1736 pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
rolling back last transaction
preoutgoing hook: s=pull
preoutgoing.forbid hook
pulling from ../a
searching for changes
abort: preoutgoing.forbid hook exited with status 1
Vadim Gelfer
support hooks written in python....
r2155 # test python hooks
error: preoutgoing.broken hook raised an exception: unsupported operand type(s) for +: 'int' and 'dict'
error: preoutgoing.raise hook raised an exception: exception from hook
pulling from ../a
searching for changes
error: preoutgoing.abort hook failed: raise abort from hook
abort: raise abort from hook
pulling from ../a
searching for changes
hook args:
hooktype preoutgoing
source pull
abort: preoutgoing.fail hook failed
pulling from ../a
searching for changes
abort: preoutgoing.uncallable hook is invalid ("hooktests.uncallable" is not callable)
pulling from ../a
searching for changes
abort: preoutgoing.nohook hook is invalid ("hooktests.nohook" is not defined)
pulling from ../a
searching for changes
abort: preoutgoing.nomodule hook is invalid ("nomodule" not in a module)
pulling from ../a
searching for changes
abort: preoutgoing.badmodule hook is invalid (import of "nomodule" failed)
pulling from ../a
searching for changes
abort: preoutgoing.unreachable hook is invalid (import of "hooktests.container" failed)
pulling from ../a
searching for changes
hook args:
hooktype preoutgoing
source pull
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
# make sure --traceback works
Traceback (most recent call last):