evolve: tests/test-uncommit.t annotate

annotate tests/test-uncommit.t @ 2583:3312f9404c00

effectflag: activate effect flag on test-uncommit.t test file Prepare activation of effect flag by default by activating it on test- uncommit.t test file first.

author	Boris Feld <boris.feld@octobus.net>
date	Sun, 04 Jun 2017 21:35:17 +0200
parents	abe6dfbdc744
children	cbc7a69116bd

rev	line source
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	1 $ cat >> $HGRCPATH <<EOF
2583 3312f9404c00 effectflag: activate effect flag on test-uncommit.t test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	2 > [experimental]
3312f9404c00 effectflag: activate effect flag on test-uncommit.t test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	3 > evolution.effect-flags = yes
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	4 > [extensions]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	5 > hgext.graphlog=
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	6 > EOF
1806 9f42f819267b evolve: move the extensions to 'hgext3rd' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1786 diff changeset	7 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	8
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	9 $ glog() {
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	10 > hg glog --template '{rev}:{node\|short}@{branch}({separate("/", obsolete, phase)}) {desc\|firstline}\n' "$@"
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	11 > }
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	12
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	13 $ hg init repo
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	14 $ cd repo
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	15
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	16 Cannot uncommit null changeset
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	17
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	18 $ hg uncommit
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	19 abort: cannot rewrite immutable changeset
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	20 [255]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	21
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	22 Cannot uncommit public changeset
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	23
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	24 $ echo a > a
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	25 $ hg ci -Am adda a
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	26 $ hg phase --public .
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	27 $ hg uncommit
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	28 abort: cannot rewrite immutable changeset
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	29 [255]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	30 $ hg phase --force --draft .
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	31
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	32 Cannot uncommit merge
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	33
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	34 $ hg up -q null
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	35 $ echo b > b
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	36 $ echo c > c
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	37 $ echo d > d
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	38 $ echo f > f
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	39 $ echo g > g
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	40 $ echo j > j
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	41 $ echo m > m
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	42 $ echo n > n
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	43 $ echo o > o
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	44 $ hg ci -Am addmore
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	45 adding b
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	46 adding c
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	47 adding d
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	48 adding f
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	49 adding g
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	50 adding j
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	51 adding m
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	52 adding n
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	53 adding o
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	54 created new head
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	55 $ hg merge
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	56 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	57 (branch merge, don't forget to commit)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	58 $ hg uncommit
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	59 abort: cannot uncommit while merging
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	60 [255]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	61 $ hg ci -m merge
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	62 $ hg uncommit
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	63 abort: cannot uncommit merge changeset
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	64 [255]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	65
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	66 Prepare complicated changeset
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	67
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	68 $ hg branch bar
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	69 marked working directory as branch bar
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	70 (branches are permanent and global, did you want a bookmark?)
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	71 $ hg cp a aa
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	72 $ echo b >> b
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	73 $ hg rm c
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	74 $ echo d >> d
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	75 $ echo e > e
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	76 $ hg mv f ff
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	77 $ hg mv g h
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	78 $ echo j >> j
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	79 $ echo k > k
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	80 $ echo l > l
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	81 $ hg rm m
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	82 $ hg rm n
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	83 $ echo o >> o
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	84 $ hg ci -Am touncommit
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	85 adding e
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	86 adding k
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	87 adding l
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	88 $ hg st --copies --change .
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	89 M b
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	90 M d
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	91 M j
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	92 M o
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	93 A aa
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	94 a
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	95 A e
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	96 A ff
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	97 f
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	98 A h
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	99 g
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	100 A k
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	101 A l
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	102 R c
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	103 R f
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	104 R g
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	105 R m
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	106 R n
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	107 $ hg man -r .
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	108 a
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	109 aa
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	110 b
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	111 d
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	112 e
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	113 ff
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	114 h
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	115 j
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	116 k
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	117 l
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	118 o
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	119
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	120 Add a couple of bookmarks
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	121
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	122 $ glog --hidden
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	123 @ 3:5eb72dbe0cb4@bar(draft) touncommit
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	124 \|
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	125 o 2:f63b90038565@default(draft) merge
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	126 \|\
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	127 \| o 1:f15c744d48e8@default(draft) addmore
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	128 \|
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	129 o 0:07f494440405@default(draft) adda
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	130
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	131 $ hg bookmark -r 2 unrelated
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	132 $ hg bookmark touncommit-bm
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	133 $ hg bookmark --inactive touncommit-bm-inactive
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	134 $ hg bookmarks
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	135 * touncommit-bm 3:5eb72dbe0cb4
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	136 touncommit-bm-inactive 3:5eb72dbe0cb4
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	137 unrelated 2:f63b90038565
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	138
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	139 Prepare complicated working directory
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	140
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	141 $ hg branch foo
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	142 marked working directory as branch foo
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	143 $ hg mv ff f
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	144 $ hg mv h i
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	145 $ hg rm j
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	146 $ hg rm k
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	147 $ echo l >> l
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	148 $ echo m > m
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	149 $ echo o > o
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	150
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	151 Test uncommit without argument, should be a no-op
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	152
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	153 $ hg uncommit
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	154 abort: nothing to uncommit
1002 195642c1520b uncommit: improve error message for use with no arguments Nathan Goldbaum <ngoldbau@ucsc.edu> parents: 964 diff changeset	155 (use --all to uncommit all files)
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	156 [255]
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	157 $ hg bookmarks
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	158 * touncommit-bm 3:5eb72dbe0cb4
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	159 touncommit-bm-inactive 3:5eb72dbe0cb4
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	160 unrelated 2:f63b90038565
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	161
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	162 Test no matches
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	163
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	164 $ hg uncommit --include nothere
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	165 abort: nothing to uncommit
1002 195642c1520b uncommit: improve error message for use with no arguments Nathan Goldbaum <ngoldbau@ucsc.edu> parents: 964 diff changeset	166 (use --all to uncommit all files)
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	167 [255]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	168
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	169 Enjoy uncommit
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	170
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	171 $ hg uncommit aa b c f ff g h j k l m o
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	172 $ hg branch
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	173 foo
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	174 $ hg st --copies
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	175 M b
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	176 A aa
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	177 a
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	178 A i
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	179 g
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	180 A l
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	181 R c
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	182 R g
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	183 R j
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	184 R m
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	185 $ cat aa
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	186 a
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	187 $ cat b
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	188 b
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	189 b
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	190 $ cat l
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	191 l
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	192 l
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	193 $ cat m
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	194 m
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	195 $ test -f c && echo 'error: c was removed!'
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	196 [1]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	197 $ test -f j && echo 'error: j was removed!'
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	198 [1]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	199 $ test -f k && echo 'error: k was removed!'
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	200 [1]
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	201 $ hg st --copies --change .
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	202 M d
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	203 A e
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	204 R n
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	205 $ hg man -r .
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	206 a
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	207 b
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	208 c
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	209 d
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	210 e
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	211 f
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	212 g
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	213 j
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	214 m
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	215 o
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	216 $ hg cat -r . d
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	217 d
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	218 d
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	219 $ hg cat -r . e
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	220 e
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	221 $ glog --hidden
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	222 @ 4:e8db4aa611f6@bar(draft) touncommit
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	223 \|
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	224 \| x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	225 \|/
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	226 o 2:f63b90038565@default(draft) merge
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	227 \|\
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	228 \| o 1:f15c744d48e8@default(draft) addmore
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	229 \|
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	230 o 0:07f494440405@default(draft) adda
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	231
313 47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	232 $ hg bookmarks
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	233 * touncommit-bm 4:e8db4aa611f6
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	234 touncommit-bm-inactive 4:e8db4aa611f6
47d10459fa24 uncommit: handle bookmarks Patrick Mezard <patrick@mezard.eu> parents: 312 diff changeset	235 unrelated 2:f63b90038565
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 385 diff changeset	236 $ hg debugobsolete
2583 3312f9404c00 effectflag: activate effect flag on test-uncommit.t test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	237 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 () {'ef1': '', 'user': 'test'} (glob)
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	238
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	239 Test phase is preserved, no local changes
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	240
625 e291e5271694 prepare for Full scale filtering !!! Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 586 diff changeset	241 $ hg up -C 3 --hidden
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	242 8 files updated, 0 files merged, 1 files removed, 0 files unresolved
964 c768f7666106 test: update to output change introduced by future 3.1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 925 diff changeset	243 (leaving bookmark touncommit-bm)
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 1806 diff changeset	244 working directory parent is obsolete! (5eb72dbe0cb4)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 1806 diff changeset	245 (use 'hg evolve' to update to its successor: e8db4aa611f6)
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	246 $ hg --config extensions.purge= purge
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	247 $ hg uncommit -I 'set:added() and e'
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	248 2 new divergent changesets
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	249 $ hg st --copies
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	250 A e
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	251 $ hg st --copies --change .
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	252 M b
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	253 M d
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	254 M j
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	255 M o
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	256 A aa
1786 b674277ea4ef uncommit: don't lose copy information of remaining files (issue5403) Martin von Zweigbergk <martinvonz@google.com> parents: 1756 diff changeset	257 a
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	258 A ff
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	259 f
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	260 A h
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	261 g
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	262 A k
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	263 A l
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	264 R c
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	265 R f
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	266 R g
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	267 R m
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	268 R n
a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	269 $ glog --hidden
1786 b674277ea4ef uncommit: don't lose copy information of remaining files (issue5403) Martin von Zweigbergk <martinvonz@google.com> parents: 1756 diff changeset	270 @ 5:a1d4c1ad76cc@bar(draft) touncommit
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	271 \|
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	272 \| o 4:e8db4aa611f6@bar(draft) touncommit
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	273 \|/
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	274 \| x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	275 \|/
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	276 o 2:f63b90038565@default(draft) merge
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	277 \|\
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	278 \| o 1:f15c744d48e8@default(draft) addmore
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	279 \|
1732 f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or "" Martin von Zweigbergk <martinvonz@google.com> parents: 1453 diff changeset	280 o 0:07f494440405@default(draft) adda
312 a7b5989d1d92 evolve: add uncommit command Patrick Mezard <patrick@mezard.eu> parents: diff changeset	281
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 385 diff changeset	282 $ hg debugobsolete
2583 3312f9404c00 effectflag: activate effect flag on test-uncommit.t test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	283 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 () {'ef1': '', 'user': 'test'} (glob)
3312f9404c00 effectflag: activate effect flag on test-uncommit.t test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	284 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 () {'ef1': '', 'user': 'test'} (glob)
314 ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	285
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	286 Test --all
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	287
625 e291e5271694 prepare for Full scale filtering !!! Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 586 diff changeset	288 $ hg up -C 3 --hidden
1786 b674277ea4ef uncommit: don't lose copy information of remaining files (issue5403) Martin von Zweigbergk <martinvonz@google.com> parents: 1756 diff changeset	289 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: 1806 diff changeset	290 working directory parent is obsolete! (5eb72dbe0cb4)
2546 abe6dfbdc744 evolve: fix typo: -list -> --list Kyle Lippincott <spectral@google.com> parents: 2289 diff changeset	291 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --divergent' to resolve the issue)
314 ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	292 $ hg --config extensions.purge= purge
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	293 $ hg uncommit --all -X e
586 f01721161532 evolve: rename conflicting into divergent Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	294 1 new divergent changesets
314 ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	295 $ hg st --copies
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	296 M b
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	297 M d
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	298 M j
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	299 M o
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	300 A aa
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	301 a
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	302 A ff
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	303 f
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	304 A h
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	305 g
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	306 A k
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	307 A l
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	308 R c
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	309 R f
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	310 R g
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	311 R m
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	312 R n
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	313 $ hg st --copies --change .
ebd286f06879 uncommit: add --all option Patrick Mezard <patrick@mezard.eu> parents: 313 diff changeset	314 A e
315 4bbc17716f5a uncommit: warn about new instability Patrick Mezard <patrick@mezard.eu> parents: 314 diff changeset	315
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 385 diff changeset	316 $ hg debugobsolete
2583 3312f9404c00 effectflag: activate effect flag on test-uncommit.t test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	317 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 () {'ef1': '', 'user': 'test'} (glob)
3312f9404c00 effectflag: activate effect flag on test-uncommit.t test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	318 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 () {'ef1': '', 'user': 'test'} (glob)
3312f9404c00 effectflag: activate effect flag on test-uncommit.t test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	319 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 () {'ef1': '', 'user': 'test'} (glob)
315 4bbc17716f5a uncommit: warn about new instability Patrick Mezard <patrick@mezard.eu> parents: 314 diff changeset	320
318 da7509e7b50c evolve: warn when uncommit leave an empty changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 316 diff changeset	321 Display a warning if nothing left
da7509e7b50c evolve: warn when uncommit leave an empty changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 316 diff changeset	322
da7509e7b50c evolve: warn when uncommit leave an empty changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 316 diff changeset	323 $ hg uncommit e
da7509e7b50c evolve: warn when uncommit leave an empty changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 316 diff changeset	324 new changeset is empty
1756 a7dcfff8c4a9 evolve: use single quotes in usage messages Martin von Zweigbergk <martinvonz@google.com> parents: 1732 diff changeset	325 (use 'hg prune .' to remove it)
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 385 diff changeset	326 $ hg debugobsolete
2583 3312f9404c00 effectflag: activate effect flag on test-uncommit.t test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	327 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 () {'ef1': '', 'user': 'test'} (glob)
3312f9404c00 effectflag: activate effect flag on test-uncommit.t test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	328 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 () {'ef1': '', 'user': 'test'} (glob)
3312f9404c00 effectflag: activate effect flag on test-uncommit.t test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	329 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 () {'ef1': '', 'user': 'test'} (glob)
3312f9404c00 effectflag: activate effect flag on test-uncommit.t test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	330 c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 () {'ef1': '', 'user': 'test'} (glob)
318 da7509e7b50c evolve: warn when uncommit leave an empty changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 316 diff changeset	331
315 4bbc17716f5a uncommit: warn about new instability Patrick Mezard <patrick@mezard.eu> parents: 314 diff changeset	332 Test instability warning
4bbc17716f5a uncommit: warn about new instability Patrick Mezard <patrick@mezard.eu> parents: 314 diff changeset	333
4bbc17716f5a uncommit: warn about new instability Patrick Mezard <patrick@mezard.eu> parents: 314 diff changeset	334 $ hg ci -m touncommit
4bbc17716f5a uncommit: warn about new instability Patrick Mezard <patrick@mezard.eu> parents: 314 diff changeset	335 $ echo unrelated > unrelated
4bbc17716f5a uncommit: warn about new instability Patrick Mezard <patrick@mezard.eu> parents: 314 diff changeset	336 $ hg ci -Am addunrelated unrelated
751 a5474648a9d2 gdown/gup: add next/previous alias Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 743 diff changeset	337 $ hg previous
315 4bbc17716f5a uncommit: warn about new instability Patrick Mezard <patrick@mezard.eu> parents: 314 diff changeset	338 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
318 da7509e7b50c evolve: warn when uncommit leave an empty changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 316 diff changeset	339 [8] touncommit
316 3db377533c32 oops (forget to amend) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 315 diff changeset	340 $ hg uncommit aa
486 2111c655b4f5 fix typo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 441 diff changeset	341 1 new unstable changesets
1058 00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	342
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	343 Test uncommiting agains a different base
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	344
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	345 $ hg cat b --rev .
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	346 b
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	347 b
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	348 $ hg cat b --rev .^
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	349 b
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	350 $ hg cat b --rev 0
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	351 b: no such file in rev 07f494440405
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	352 [1]
1143 160fd06312fc uncommit: abort when rev specifies the current changeset Nathan Goldbaum <ngoldbau@ucsc.edu> parents: 1065 diff changeset	353 $ hg uncommit --rev . b
160fd06312fc uncommit: abort when rev specifies the current changeset Nathan Goldbaum <ngoldbau@ucsc.edu> parents: 1065 diff changeset	354 abort: cannot uncommit to parent changeset
160fd06312fc uncommit: abort when rev specifies the current changeset Nathan Goldbaum <ngoldbau@ucsc.edu> parents: 1065 diff changeset	355 [255]
1058 00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	356 $ hg uncommit --rev 0 b
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	357 $ hg cat b --rev .
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	358 b: no such file in rev 5b27f6b17da2
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	359 [1]
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	360
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	361 Test uncommiting precursors
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	362
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	363 $ hg uncommit --hidden --rev 'precursors(.)' b
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	364 $ hg cat b --rev .
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	365 b
00bc31523074 uncommit: add a --rev argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 1002 diff changeset	366 b

Mercurial > evolve

annotate tests/test-uncommit.t @ 2583:3312f9404c00