--- a/mercurial/commands.py Thu May 14 13:20:40 2009 -0500
+++ b/mercurial/commands.py Thu May 14 13:20:40 2009 -0500
@@ -2252,34 +2252,6 @@
r = repo.push(other, opts.get('force'), revs=revs)
return r == 0
-def rawcommit(ui, repo, *pats, **opts):
- """raw commit interface (DEPRECATED)
-
- (DEPRECATED)
- Lowlevel commit, for use in helper scripts.
-
- This command is not intended to be used by normal users, as it is
- primarily useful for importing from other SCMs.
-
- This command is now deprecated and will be removed in a future
- release, please use debugsetparents and commit instead.
- """
-
- ui.warn(_("(the rawcommit command is deprecated)\n"))
-
- message = cmdutil.logmessage(opts)
-
- files = cmdutil.match(repo, pats, opts).files()
- if opts.get('files'):
- files += open(opts['files']).read().splitlines()
-
- parents = [repo.lookup(p) for p in opts['parent']]
-
- try:
- repo.rawcommit(files, message, opts['user'], opts['date'], *parents)
- except ValueError, inst:
- raise util.Abort(str(inst))
-
def recover(ui, repo):
"""roll back an interrupted transaction
@@ -3206,12 +3178,6 @@
"debugindex": (debugindex, [], _('FILE')),
"debugindexdot": (debugindexdot, [], _('FILE')),
"debuginstall": (debuginstall, []),
- "debugrawcommit|rawcommit":
- (rawcommit,
- [('p', 'parent', [], _('parent')),
- ('F', 'files', '', _('file list'))
- ] + commitopts + commitopts2,
- _('[OPTION]... [FILE]...')),
"debugrebuildstate":
(debugrebuildstate,
[('r', 'rev', '', _('revision to rebuild to'))],
--- a/mercurial/localrepo.py Thu May 14 13:20:40 2009 -0500
+++ b/mercurial/localrepo.py Thu May 14 13:20:40 2009 -0500
@@ -776,12 +776,6 @@
changelist.append(fname)
return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
- def rawcommit(self, files, text, user, date, p1=None, p2=None, extra={}):
- if p1 is None:
- p1, p2 = self.dirstate.parents()
- return self.commit(files=files, text=text, user=user, date=date,
- p1=p1, p2=p2, extra=extra, empty_ok=True)
-
def commit(self, files=None, text="", user=None, date=None,
match=None, force=False, force_editor=False,
p1=None, p2=None, extra={}, empty_ok=False):
@@ -793,34 +787,27 @@
try:
wlock = self.wlock()
lock = self.lock()
- use_dirstate = (p1 is None) # not rawcommit
+
+ p1, p2 = self.dirstate.parents()
- if use_dirstate:
- p1, p2 = self.dirstate.parents()
- update_dirstate = True
-
- if (not force and p2 != nullid and
- (match and (match.files() or match.anypats()))):
- raise util.Abort(_('cannot partially commit a merge '
- '(do not specify files or patterns)'))
+ if (not force and p2 != nullid and
+ (match and (match.files() or match.anypats()))):
+ raise util.Abort(_('cannot partially commit a merge '
+ '(do not specify files or patterns)'))
- if files:
- modified, removed = [], []
- for f in files:
- s = self.dirstate[f]
- if s in 'nma':
- modified.append(f)
- elif s == 'r':
- removed.append(f)
- else:
- self.ui.warn(_("%s not tracked!\n") % f)
- changes = [modified, [], removed, [], []]
- else:
- changes = self.status(match=match)
+ if files:
+ modified, removed = [], []
+ for f in files:
+ s = self.dirstate[f]
+ if s in 'nma':
+ modified.append(f)
+ elif s == 'r':
+ removed.append(f)
+ else:
+ self.ui.warn(_("%s not tracked!\n") % f)
+ changes = [modified, [], removed, [], []]
else:
- p1, p2 = p1, p2 or nullid
- update_dirstate = (self.dirstate.parents()[0] == p1)
- changes = [files, [], [], [], []]
+ changes = self.status(match=match)
ms = merge_.mergestate(self)
for f in changes[0]:
@@ -830,7 +817,7 @@
wctx = context.workingctx(self, (p1, p2), text, user, date,
extra, changes)
r = self._commitctx(wctx, force, force_editor, empty_ok,
- use_dirstate, update_dirstate)
+ True, True)
ms.reset()
return r
--- a/tests/run-tests.py Thu May 14 13:20:40 2009 -0500
+++ b/tests/run-tests.py Thu May 14 13:20:40 2009 -0500
@@ -360,7 +360,6 @@
hgrc.write('[defaults]\n')
hgrc.write('backout = -d "0 0"\n')
hgrc.write('commit = -d "0 0"\n')
- hgrc.write('debugrawcommit = -d "0 0"\n')
hgrc.write('tag = -d "0 0"\n')
hgrc.close()
--- a/tests/test-debugcomplete.out Thu May 14 13:20:40 2009 -0500
+++ b/tests/test-debugcomplete.out Thu May 14 13:20:40 2009 -0500
@@ -69,7 +69,6 @@
debugindex
debugindexdot
debuginstall
-debugrawcommit
debugrebuildstate
debugrename
debugsetparents
@@ -87,7 +86,7 @@
root
% Show the alias of a debug command if there are no other candidates
-rawcommit
+
% Show the global options
--config
@@ -196,7 +195,6 @@
debugindex:
debugindexdot:
debuginstall:
-debugrawcommit: parent, files, message, logfile, date, user
debugrebuildstate: rev
debugrename: rev
debugsetparents:
--- a/tests/test-glog Thu May 14 13:20:40 2009 -0500
+++ b/tests/test-glog Thu May 14 13:20:40 2009 -0500
@@ -82,9 +82,8 @@
if [ "$#" -gt 0 ]; then
hg debugsetparents "$@"
fi
- echo $rev > $rev
- hg add $rev
- hg rawcommit -q -d "$rev 0" -m "($rev) $msg" $rev
+ echo $rev > a
+ hg commit -Aqd "$rev 0" -m "($rev) $msg"
}
echo "[extensions]" >> $HGRCPATH
@@ -142,7 +141,7 @@
hg glog
echo % file glog
-hg glog 5
+hg glog a
echo % unused arguments
hg glog -q foo bar || echo failed
@@ -150,7 +149,7 @@
echo % from outer space
cd ..
hg glog -l1 repo
-hg glog -l1 repo/0
+hg glog -l1 repo/a
hg glog -l1 repo/missing
echo % file log with revs != cset revs
--- a/tests/test-glog.out Thu May 14 13:20:40 2009 -0500
+++ b/tests/test-glog.out Thu May 14 13:20:40 2009 -0500
@@ -1,354 +1,546 @@
% init
% empty repo
% building tree
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
-(the rawcommit command is deprecated)
% glog -q
-@ 34:0eed7cd895e0
+@ 34:fea3ac5810e0
|
-| o 33:2e9d1b521374
+| o 33:68608f5145f9
| |
-o | 32:77f7d8438a3c
+o | 32:d06dffa21a31
|\ \
-| o \ 31:82ee55204a79
+| o \ 31:621d83e11f67
| |\ \
-| | o \ 30:777dfc428649
+| | o \ 30:6e11cd4b648f
| | |\ \
-| | | o | 29:f8e7fee63353
+| | | o | 29:cd9bb2be7593
| | | | |
-| | o | | 28:4b6e9bd48cf9
+| | o | | 28:44ecd0b9ae99
| | |\ \ \
-o | | | | | 27:e9e08174cd30
+o | | | | | 27:886ed638191b
|/ / / / /
-| | o---+ 26:720dc079a855
+| | o---+ 26:7f25b6c2f0b9
| | | | |
-+---o | | 25:9d4ed048d013
++---o | | 25:91da8ed57247
| | | | |
-| | o | | 24:4a68967db00d
+| | o | | 24:a9c19a3d96b7
| | |\| |
-| | o | | 23:bc31393cabdf
+| | o | | 23:a01cddf0766d
| |/| | |
-+---o---+ 22:a37f2ea6ebc6
++---o---+ 22:e0d9cccacb5d
| | / /
-o | | | 21:e758e8f4ace9
+o | | | 21:d42a756af44d
|\ \ \ \
-| o---+-+ 20:aeccadad74b4
+| o---+-+ 20:d30ed6450e32
| / / /
-o | | | 19:138069b5dad7
+o | | | 19:31ddc2c1573b
|\ \ \ \
-+---+---o 18:5a8c9a29ef81
++---+---o 18:1aa84d96232a
| | | |
-| o | | 17:43e52b935494
+| o | | 17:44765d7c06e0
| |\ \ \
-| | o---+ 16:449a2f9562a4
+| | o---+ 16:3677d192927d
| | |/ /
-o | | | 15:c0b4283d4c1d
+o | | | 15:1dda3f72782d
|\ \ \ \
-| o-----+ 14:9d533950abf0
+| o-----+ 14:8eac370358ef
| |/ / /
-o | | | 13:c39d0a2b8165
+o | | | 13:22d8966a97e3
|\ \ \ \
-+---o | | 12:74dc7aea4494
++---o | | 12:86b91144a6e9
| | |/ /
-| o | | 11:c3c395dd8b98
+| o | | 11:832d76e6bdf2
| |\ \ \
-| | o---+ 10:8094c50149ef
+| | o---+ 10:74c64d036d72
| |/ / /
-o | | | 9:79ab1812f961
+o | | | 9:7010c0af0a35
|\ \ \ \
-| o-----+ 8:d7aa38594334
+| o-----+ 8:7a0b11f71937
|/ / / /
-o | | | 7:699392d1259e
+o | | | 7:b632bb1b1224
|\ \ \ \
-+---o | | 6:0ca7c061cf45
++---o | | 6:b105a072e251
| |/ / /
-| o | | 5:3589c3c477ab
+| o | | 5:4409d547b708
| |\ \ \
-| | o | | 4:e2cad8233c77
+| | o | | 4:26a8bac39d9f
| |/|/ /
-| o / / 3:02173ffbf857
+| o / / 3:27eef8ed80b4
|/ / /
-o / / 2:e8ea2256f9ec
+o / / 2:3d9a33b8d1e1
|/ /
-o / 1:3cae7826a707
+o / 1:6db2ef61d156
|/
-o 0:7aa22e58e8c1
+o 0:e6eb3150255d
% glog
-@ changeset: 34:0eed7cd895e0
+@ changeset: 34:fea3ac5810e0
| tag: tip
-| parent: 32:77f7d8438a3c
+| parent: 32:d06dffa21a31
| user: test
| date: Thu Jan 01 00:00:34 1970 +0000
| summary: (34) head
|
-| o changeset: 33:2e9d1b521374
-| | parent: 18:5a8c9a29ef81
+| o changeset: 33:68608f5145f9
+| | parent: 18:1aa84d96232a
| | user: test
| | date: Thu Jan 01 00:00:33 1970 +0000
| | summary: (33) head
| |
-o | changeset: 32:77f7d8438a3c
-|\ \ parent: 27:e9e08174cd30
-| | | parent: 31:82ee55204a79
+o | changeset: 32:d06dffa21a31
+|\ \ parent: 27:886ed638191b
+| | | parent: 31:621d83e11f67
| | | user: test
| | | date: Thu Jan 01 00:00:32 1970 +0000
| | | summary: (32) expand
| | |
-| o | changeset: 31:82ee55204a79
-| |\ \ parent: 21:e758e8f4ace9
-| | | | parent: 30:777dfc428649
+| o | changeset: 31:621d83e11f67
+| |\ \ parent: 21:d42a756af44d
+| | | | parent: 30:6e11cd4b648f
| | | | user: test
| | | | date: Thu Jan 01 00:00:31 1970 +0000
| | | | summary: (31) expand
| | | |
-| | o | changeset: 30:777dfc428649
-| | |\ \ parent: 28:4b6e9bd48cf9
-| | | | | parent: 29:f8e7fee63353
+| | o | changeset: 30:6e11cd4b648f
+| | |\ \ parent: 28:44ecd0b9ae99
+| | | | | parent: 29:cd9bb2be7593
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:30 1970 +0000
| | | | | summary: (30) expand
| | | | |
-| | | o | changeset: 29:f8e7fee63353
-| | | | | parent: 0:7aa22e58e8c1
+| | | o | changeset: 29:cd9bb2be7593
+| | | | | parent: 0:e6eb3150255d
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:29 1970 +0000
| | | | | summary: (29) regular commit
| | | | |
-| | o | | changeset: 28:4b6e9bd48cf9
-| | |\ \ \ parent: 1:3cae7826a707
-| | | | | | parent: 26:720dc079a855
+| | o | | changeset: 28:44ecd0b9ae99
+| | |\ \ \ parent: 1:6db2ef61d156
+| | | | | | parent: 26:7f25b6c2f0b9
| | | | | | user: test
| | | | | | date: Thu Jan 01 00:00:28 1970 +0000
| | | | | | summary: (28) merge zero known
| | | | | |
-o | | | | | changeset: 27:e9e08174cd30
-|/ / / / / parent: 21:e758e8f4ace9
+o | | | | | changeset: 27:886ed638191b
+|/ / / / / parent: 21:d42a756af44d
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:27 1970 +0000
| | | | | summary: (27) collapse
| | | | |
-| | o---+ changeset: 26:720dc079a855
-| | | | | parent: 18:5a8c9a29ef81
-| | | | | parent: 25:9d4ed048d013
+| | o---+ changeset: 26:7f25b6c2f0b9
+| | | | | parent: 18:1aa84d96232a
+| | | | | parent: 25:91da8ed57247
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:26 1970 +0000
| | | | | summary: (26) merge one known; far right
| | | | |
-+---o | | changeset: 25:9d4ed048d013
-| | | | | parent: 21:e758e8f4ace9
-| | | | | parent: 24:4a68967db00d
++---o | | changeset: 25:91da8ed57247
+| | | | | parent: 21:d42a756af44d
+| | | | | parent: 24:a9c19a3d96b7
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:25 1970 +0000
| | | | | summary: (25) merge one known; far left
| | | | |
-| | o | | changeset: 24:4a68967db00d
-| | |\| | parent: 0:7aa22e58e8c1
-| | | | | parent: 23:bc31393cabdf
+| | o | | changeset: 24:a9c19a3d96b7
+| | |\| | parent: 0:e6eb3150255d
+| | | | | parent: 23:a01cddf0766d
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:24 1970 +0000
| | | | | summary: (24) merge one known; immediate right
| | | | |
-| | o | | changeset: 23:bc31393cabdf
-| |/| | | parent: 1:3cae7826a707
-| | | | | parent: 22:a37f2ea6ebc6
+| | o | | changeset: 23:a01cddf0766d
+| |/| | | parent: 1:6db2ef61d156
+| | | | | parent: 22:e0d9cccacb5d
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:23 1970 +0000
| | | | | summary: (23) merge one known; immediate left
| | | | |
-+---o---+ changeset: 22:a37f2ea6ebc6
-| | | | parent: 18:5a8c9a29ef81
-| | / / parent: 21:e758e8f4ace9
++---o---+ changeset: 22:e0d9cccacb5d
+| | | | parent: 18:1aa84d96232a
+| | / / parent: 21:d42a756af44d
| | | | user: test
| | | | date: Thu Jan 01 00:00:22 1970 +0000
| | | | summary: (22) merge two known; one far left, one far right
| | | |
-o | | | changeset: 21:e758e8f4ace9
-|\ \ \ \ parent: 19:138069b5dad7
-| | | | | parent: 20:aeccadad74b4
+o | | | changeset: 21:d42a756af44d
+|\ \ \ \ parent: 19:31ddc2c1573b
+| | | | | parent: 20:d30ed6450e32
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:21 1970 +0000
| | | | | summary: (21) expand
| | | | |
-| o---+-+ changeset: 20:aeccadad74b4
-| | | | parent: 0:7aa22e58e8c1
-| / / / parent: 18:5a8c9a29ef81
+| o---+-+ changeset: 20:d30ed6450e32
+| | | | parent: 0:e6eb3150255d
+| / / / parent: 18:1aa84d96232a
| | | | user: test
| | | | date: Thu Jan 01 00:00:20 1970 +0000
| | | | summary: (20) merge two known; two far right
| | | |
-o | | | changeset: 19:138069b5dad7
-|\ \ \ \ parent: 15:c0b4283d4c1d
-| | | | | parent: 17:43e52b935494
+o | | | changeset: 19:31ddc2c1573b
+|\ \ \ \ parent: 15:1dda3f72782d
+| | | | | parent: 17:44765d7c06e0
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:19 1970 +0000
| | | | | summary: (19) expand
| | | | |
-+---+---o changeset: 18:5a8c9a29ef81
-| | | | parent: 1:3cae7826a707
-| | | | parent: 15:c0b4283d4c1d
++---+---o changeset: 18:1aa84d96232a
+| | | | parent: 1:6db2ef61d156
+| | | | parent: 15:1dda3f72782d
| | | | user: test
| | | | date: Thu Jan 01 00:00:18 1970 +0000
| | | | summary: (18) merge two known; two far left
| | | |
-| o | | changeset: 17:43e52b935494
-| |\ \ \ parent: 12:74dc7aea4494
-| | | | | parent: 16:449a2f9562a4
+| o | | changeset: 17:44765d7c06e0
+| |\ \ \ parent: 12:86b91144a6e9
+| | | | | parent: 16:3677d192927d
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:17 1970 +0000
| | | | | summary: (17) expand
| | | | |
-| | o---+ changeset: 16:449a2f9562a4
-| | | | | parent: 0:7aa22e58e8c1
-| | |/ / parent: 1:3cae7826a707
+| | o---+ changeset: 16:3677d192927d
+| | | | | parent: 0:e6eb3150255d
+| | |/ / parent: 1:6db2ef61d156
| | | | user: test
| | | | date: Thu Jan 01 00:00:16 1970 +0000
| | | | summary: (16) merge two known; one immediate right, one near right
| | | |
-o | | | changeset: 15:c0b4283d4c1d
-|\ \ \ \ parent: 13:c39d0a2b8165
-| | | | | parent: 14:9d533950abf0
+o | | | changeset: 15:1dda3f72782d
+|\ \ \ \ parent: 13:22d8966a97e3
+| | | | | parent: 14:8eac370358ef
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:15 1970 +0000
| | | | | summary: (15) expand
| | | | |
-| o-----+ changeset: 14:9d533950abf0
-| | | | | parent: 0:7aa22e58e8c1
-| |/ / / parent: 12:74dc7aea4494
+| o-----+ changeset: 14:8eac370358ef
+| | | | | parent: 0:e6eb3150255d
+| |/ / / parent: 12:86b91144a6e9
| | | | user: test
| | | | date: Thu Jan 01 00:00:14 1970 +0000
| | | | summary: (14) merge two known; one immediate right, one far right
| | | |
-o | | | changeset: 13:c39d0a2b8165
-|\ \ \ \ parent: 9:79ab1812f961
-| | | | | parent: 11:c3c395dd8b98
+o | | | changeset: 13:22d8966a97e3
+|\ \ \ \ parent: 9:7010c0af0a35
+| | | | | parent: 11:832d76e6bdf2
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:13 1970 +0000
| | | | | summary: (13) expand
| | | | |
-+---o | | changeset: 12:74dc7aea4494
-| | |/ / parent: 1:3cae7826a707
-| | | | parent: 9:79ab1812f961
++---o | | changeset: 12:86b91144a6e9
+| | |/ / parent: 1:6db2ef61d156
+| | | | parent: 9:7010c0af0a35
| | | | user: test
| | | | date: Thu Jan 01 00:00:12 1970 +0000
| | | | summary: (12) merge two known; one immediate right, one far left
| | | |
-| o | | changeset: 11:c3c395dd8b98
-| |\ \ \ parent: 6:0ca7c061cf45
-| | | | | parent: 10:8094c50149ef
+| o | | changeset: 11:832d76e6bdf2
+| |\ \ \ parent: 6:b105a072e251
+| | | | | parent: 10:74c64d036d72
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:11 1970 +0000
| | | | | summary: (11) expand
| | | | |
-| | o---+ changeset: 10:8094c50149ef
-| | | | | parent: 0:7aa22e58e8c1
-| |/ / / parent: 6:0ca7c061cf45
+| | o---+ changeset: 10:74c64d036d72
+| | | | | parent: 0:e6eb3150255d
+| |/ / / parent: 6:b105a072e251
| | | | user: test
| | | | date: Thu Jan 01 00:00:10 1970 +0000
| | | | summary: (10) merge two known; one immediate left, one near right
| | | |
-o | | | changeset: 9:79ab1812f961
-|\ \ \ \ parent: 7:699392d1259e
-| | | | | parent: 8:d7aa38594334
+o | | | changeset: 9:7010c0af0a35
+|\ \ \ \ parent: 7:b632bb1b1224
+| | | | | parent: 8:7a0b11f71937
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:09 1970 +0000
| | | | | summary: (9) expand
| | | | |
-| o-----+ changeset: 8:d7aa38594334
-| | | | | parent: 0:7aa22e58e8c1
-|/ / / / parent: 7:699392d1259e
+| o-----+ changeset: 8:7a0b11f71937
+| | | | | parent: 0:e6eb3150255d
+|/ / / / parent: 7:b632bb1b1224
| | | | user: test
| | | | date: Thu Jan 01 00:00:08 1970 +0000
| | | | summary: (8) merge two known; one immediate left, one far right
| | | |
-o | | | changeset: 7:699392d1259e
-|\ \ \ \ parent: 2:e8ea2256f9ec
-| | | | | parent: 5:3589c3c477ab
+o | | | changeset: 7:b632bb1b1224
+|\ \ \ \ parent: 2:3d9a33b8d1e1
+| | | | | parent: 5:4409d547b708
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:07 1970 +0000
| | | | | summary: (7) expand
| | | | |
-+---o | | changeset: 6:0ca7c061cf45
-| |/ / / parent: 2:e8ea2256f9ec
-| | | | parent: 5:3589c3c477ab
++---o | | changeset: 6:b105a072e251
+| |/ / / parent: 2:3d9a33b8d1e1
+| | | | parent: 5:4409d547b708
| | | | user: test
| | | | date: Thu Jan 01 00:00:06 1970 +0000
| | | | summary: (6) merge two known; one immediate left, one far left
| | | |
-| o | | changeset: 5:3589c3c477ab
-| |\ \ \ parent: 3:02173ffbf857
-| | | | | parent: 4:e2cad8233c77
+| o | | changeset: 5:4409d547b708
+| |\ \ \ parent: 3:27eef8ed80b4
+| | | | | parent: 4:26a8bac39d9f
| | | | | user: test
| | | | | date: Thu Jan 01 00:00:05 1970 +0000
| | | | | summary: (5) expand
| | | | |
-| | o | | changeset: 4:e2cad8233c77
-| |/|/ / parent: 1:3cae7826a707
-| | | | parent: 3:02173ffbf857
+| | o | | changeset: 4:26a8bac39d9f
+| |/|/ / parent: 1:6db2ef61d156
+| | | | parent: 3:27eef8ed80b4
| | | | user: test
| | | | date: Thu Jan 01 00:00:04 1970 +0000
| | | | summary: (4) merge two known; one immediate left, one immediate right
| | | |
-| o | | changeset: 3:02173ffbf857
+| o | | changeset: 3:27eef8ed80b4
|/ / / user: test
| | | date: Thu Jan 01 00:00:03 1970 +0000
| | | summary: (3) collapse
| | |
-o | | changeset: 2:e8ea2256f9ec
+o | | changeset: 2:3d9a33b8d1e1
|/ / user: test
| | date: Thu Jan 01 00:00:02 1970 +0000
| | summary: (2) collapse
| |
-o | changeset: 1:3cae7826a707
+o | changeset: 1:6db2ef61d156
|/ user: test
| date: Thu Jan 01 00:00:01 1970 +0000
| summary: (1) collapse
|
-o changeset: 0:7aa22e58e8c1
+o changeset: 0:e6eb3150255d
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: (0) root
% file glog
-o changeset: 5:3589c3c477ab
- parent: 3:02173ffbf857
- parent: 4:e2cad8233c77
+@ changeset: 34:fea3ac5810e0
+| tag: tip
+| parent: 32:d06dffa21a31
+| user: test
+| date: Thu Jan 01 00:00:34 1970 +0000
+| summary: (34) head
+|
+| o changeset: 33:68608f5145f9
+| | parent: 18:1aa84d96232a
+| | user: test
+| | date: Thu Jan 01 00:00:33 1970 +0000
+| | summary: (33) head
+| |
+o | changeset: 32:d06dffa21a31
+|\ \ parent: 27:886ed638191b
+| | | parent: 31:621d83e11f67
+| | | user: test
+| | | date: Thu Jan 01 00:00:32 1970 +0000
+| | | summary: (32) expand
+| | |
+| o | changeset: 31:621d83e11f67
+| | | parent: 21:d42a756af44d
+| | | parent: 30:6e11cd4b648f
+| | | user: test
+| | | date: Thu Jan 01 00:00:31 1970 +0000
+| | | summary: (31) expand
+| | |
+| o | changeset: 30:6e11cd4b648f
+| |\ \ parent: 28:44ecd0b9ae99
+| | | | parent: 29:cd9bb2be7593
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:30 1970 +0000
+| | | | summary: (30) expand
+| | | |
+| | o | changeset: 29:cd9bb2be7593
+| | | | parent: 0:e6eb3150255d
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:29 1970 +0000
+| | | | summary: (29) regular commit
+| | | |
+| o | | changeset: 28:44ecd0b9ae99
+| | | | parent: 1:6db2ef61d156
+| | | | parent: 26:7f25b6c2f0b9
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:28 1970 +0000
+| | | | summary: (28) merge zero known
+| | | |
+o | | | changeset: 27:886ed638191b
+| | | | parent: 21:d42a756af44d
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:27 1970 +0000
+| | | | summary: (27) collapse
+| | | |
+| o | | changeset: 26:7f25b6c2f0b9
+| | | | parent: 18:1aa84d96232a
+| | | | parent: 25:91da8ed57247
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:26 1970 +0000
+| | | | summary: (26) merge one known; far right
+| | | |
+| o | | changeset: 25:91da8ed57247
+| | | | parent: 21:d42a756af44d
+| | | | parent: 24:a9c19a3d96b7
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:25 1970 +0000
+| | | | summary: (25) merge one known; far left
+| | | |
+| o | | changeset: 24:a9c19a3d96b7
+| | | | parent: 0:e6eb3150255d
+| | | | parent: 23:a01cddf0766d
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:24 1970 +0000
+| | | | summary: (24) merge one known; immediate right
+| | | |
+| o | | changeset: 23:a01cddf0766d
+| | | | parent: 1:6db2ef61d156
+| | | | parent: 22:e0d9cccacb5d
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:23 1970 +0000
+| | | | summary: (23) merge one known; immediate left
+| | | |
+| o | | changeset: 22:e0d9cccacb5d
+|/ / / parent: 18:1aa84d96232a
+| | | parent: 21:d42a756af44d
+| | | user: test
+| | | date: Thu Jan 01 00:00:22 1970 +0000
+| | | summary: (22) merge two known; one far left, one far right
+| | |
+o | | changeset: 21:d42a756af44d
+|\ \ \ parent: 19:31ddc2c1573b
+| | | | parent: 20:d30ed6450e32
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:21 1970 +0000
+| | | | summary: (21) expand
+| | | |
+| o---+ changeset: 20:d30ed6450e32
+| | | parent: 0:e6eb3150255d
+| / / parent: 18:1aa84d96232a
+| | | user: test
+| | | date: Thu Jan 01 00:00:20 1970 +0000
+| | | summary: (20) merge two known; two far right
+| | |
+o | | changeset: 19:31ddc2c1573b
+|\ \ \ parent: 15:1dda3f72782d
+| | | | parent: 17:44765d7c06e0
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:19 1970 +0000
+| | | | summary: (19) expand
+| | | |
++-----o changeset: 18:1aa84d96232a
+| | | parent: 1:6db2ef61d156
+| | | parent: 15:1dda3f72782d
+| | | user: test
+| | | date: Thu Jan 01 00:00:18 1970 +0000
+| | | summary: (18) merge two known; two far left
+| | |
+| o | changeset: 17:44765d7c06e0
+| |\ \ parent: 12:86b91144a6e9
+| | | | parent: 16:3677d192927d
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:17 1970 +0000
+| | | | summary: (17) expand
+| | | |
+| | o | changeset: 16:3677d192927d
+| | | | parent: 0:e6eb3150255d
+| | | | parent: 1:6db2ef61d156
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:16 1970 +0000
+| | | | summary: (16) merge two known; one immediate right, one near right
+| | | |
+o | | | changeset: 15:1dda3f72782d
+|\ \ \ \ parent: 13:22d8966a97e3
+| | | | | parent: 14:8eac370358ef
+| | | | | user: test
+| | | | | date: Thu Jan 01 00:00:15 1970 +0000
+| | | | | summary: (15) expand
+| | | | |
+| o | | | changeset: 14:8eac370358ef
+| |/ / / parent: 0:e6eb3150255d
+| | | | parent: 12:86b91144a6e9
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:14 1970 +0000
+| | | | summary: (14) merge two known; one immediate right, one far right
+| | | |
+o | | | changeset: 13:22d8966a97e3
+|\ \ \ \ parent: 9:7010c0af0a35
+| | | | | parent: 11:832d76e6bdf2
+| | | | | user: test
+| | | | | date: Thu Jan 01 00:00:13 1970 +0000
+| | | | | summary: (13) expand
+| | | | |
++---o | | changeset: 12:86b91144a6e9
+| | / / parent: 1:6db2ef61d156
+| | | | parent: 9:7010c0af0a35
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:12 1970 +0000
+| | | | summary: (12) merge two known; one immediate right, one far left
+| | | |
+| o | | changeset: 11:832d76e6bdf2
+| | | | parent: 6:b105a072e251
+| | | | parent: 10:74c64d036d72
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:11 1970 +0000
+| | | | summary: (11) expand
+| | | |
+| o | | changeset: 10:74c64d036d72
+| | | | parent: 0:e6eb3150255d
+| | | | parent: 6:b105a072e251
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:10 1970 +0000
+| | | | summary: (10) merge two known; one immediate left, one near right
+| | | |
+o | | | changeset: 9:7010c0af0a35
+| | | | parent: 7:b632bb1b1224
+| | | | parent: 8:7a0b11f71937
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:09 1970 +0000
+| | | | summary: (9) expand
+| | | |
+o | | | changeset: 8:7a0b11f71937
+| | | | parent: 0:e6eb3150255d
+| | | | parent: 7:b632bb1b1224
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:08 1970 +0000
+| | | | summary: (8) merge two known; one immediate left, one far right
+| | | |
+o | | | changeset: 7:b632bb1b1224
+| | | | parent: 2:3d9a33b8d1e1
+| | | | parent: 5:4409d547b708
+| | | | user: test
+| | | | date: Thu Jan 01 00:00:07 1970 +0000
+| | | | summary: (7) expand
+| | | |
+| o | | changeset: 6:b105a072e251
+|/ / / parent: 2:3d9a33b8d1e1
+| | | parent: 5:4409d547b708
+| | | user: test
+| | | date: Thu Jan 01 00:00:06 1970 +0000
+| | | summary: (6) merge two known; one immediate left, one far left
+| | |
+o | | changeset: 5:4409d547b708
+| | | parent: 3:27eef8ed80b4
+| | | parent: 4:26a8bac39d9f
+| | | user: test
+| | | date: Thu Jan 01 00:00:05 1970 +0000
+| | | summary: (5) expand
+| | |
+o | | changeset: 4:26a8bac39d9f
+| | | parent: 1:6db2ef61d156
+| | | parent: 3:27eef8ed80b4
+| | | user: test
+| | | date: Thu Jan 01 00:00:04 1970 +0000
+| | | summary: (4) merge two known; one immediate left, one immediate right
+| | |
+o | | changeset: 3:27eef8ed80b4
+| | | user: test
+| | | date: Thu Jan 01 00:00:03 1970 +0000
+| | | summary: (3) collapse
+| | |
+o | | changeset: 2:3d9a33b8d1e1
+|/ / user: test
+| | date: Thu Jan 01 00:00:02 1970 +0000
+| | summary: (2) collapse
+| |
+o | changeset: 1:6db2ef61d156
+|/ user: test
+| date: Thu Jan 01 00:00:01 1970 +0000
+| summary: (1) collapse
+|
+o changeset: 0:e6eb3150255d
user: test
- date: Thu Jan 01 00:00:05 1970 +0000
- summary: (5) expand
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: (0) root
% unused arguments
hg glog: invalid arguments
@@ -357,18 +549,20 @@
show revision history alongside an ASCII revision graph
failed
% from outer space
-@ changeset: 34:0eed7cd895e0
+@ changeset: 34:fea3ac5810e0
| tag: tip
-| parent: 32:77f7d8438a3c
+| parent: 32:d06dffa21a31
| user: test
| date: Thu Jan 01 00:00:34 1970 +0000
| summary: (34) head
|
-o changeset: 0:7aa22e58e8c1
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- summary: (0) root
-
+@ changeset: 34:fea3ac5810e0
+| tag: tip
+| parent: 32:d06dffa21a31
+| user: test
+| date: Thu Jan 01 00:00:34 1970 +0000
+| summary: (34) head
+|
% file log with revs != cset revs
@ changeset: 2:12c28321755b
| tag: tip
@@ -386,39 +580,39 @@
adding changesets
adding manifests
adding file changes
-added 31 changesets with 31 changes to 31 files
-o 34:0eed7cd895e0
+added 31 changesets with 31 changes to 1 files
+o 34:fea3ac5810e0
|
-| o 33:2e9d1b521374
+| o 33:68608f5145f9
|
-o 32:77f7d8438a3c
+o 32:d06dffa21a31
|
-o 27:e9e08174cd30
+o 27:886ed638191b
comparing with repo2
searching for changes
-@ changeset: 34:0eed7cd895e0
+@ changeset: 34:fea3ac5810e0
| tag: tip
-| parent: 32:77f7d8438a3c
+| parent: 32:d06dffa21a31
| user: test
| date: Thu Jan 01 00:00:34 1970 +0000
| summary: (34) head
|
-| o changeset: 33:2e9d1b521374
-| parent: 18:5a8c9a29ef81
+| o changeset: 33:68608f5145f9
+| parent: 18:1aa84d96232a
| user: test
| date: Thu Jan 01 00:00:33 1970 +0000
| summary: (33) head
|
-o changeset: 32:77f7d8438a3c
-| parent: 27:e9e08174cd30
-| parent: 31:82ee55204a79
+o changeset: 32:d06dffa21a31
+| parent: 27:886ed638191b
+| parent: 31:621d83e11f67
| user: test
| date: Thu Jan 01 00:00:32 1970 +0000
| summary: (32) expand
|
-o changeset: 27:e9e08174cd30
- parent: 21:e758e8f4ace9
+o changeset: 27:886ed638191b
+ parent: 21:d42a756af44d
user: test
date: Thu Jan 01 00:00:27 1970 +0000
summary: (27) collapse
--- a/tests/test-hgrc.out Thu May 14 13:20:40 2009 -0500
+++ b/tests/test-hgrc.out Thu May 14 13:20:40 2009 -0500
@@ -7,7 +7,6 @@
bundle.mainreporoot=.../foobar
defaults.backout=-d "0 0"
defaults.commit=-d "0 0"
-defaults.debugrawcommit=-d "0 0"
defaults.tag=-d "0 0"
paths.default=.../foo%bar
ui.slash=True
--- a/tests/test-rawcommit1 Thu May 14 13:20:40 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#!/bin/sh
-hg --debug init
-echo this is a1 > a
-hg add a
-hg commit -m0 -d "1000000 0"
-echo this is b1 > b
-hg add b
-hg commit -m1 -d "1000000 0"
-hg manifest --debug 1
-echo this is c1 > c
-hg rawcommit -p 1 -d "1000000 0" -m2 c
-hg manifest --debug 2
-hg -v parents
-rm b
-hg rawcommit -p 2 -d "1000000 0" -m3 b
-hg manifest --debug 3
-hg -v parents
-echo this is a22 > a
-hg rawcommit -p 3 -d "1000000 0" -m4 a
-hg manifest --debug 4
-hg -v parents
-echo this is c22 > c
-hg rawcommit -p 1 -d "1000000 0" -m5 c
-hg manifest --debug 5
-hg -v parents
-# merge, but no files changed
-hg rawcommit -p 4 -p 5 -d "1000000 0" -m6
-hg manifest --debug 6
-hg -v parents
-# no changes what-so-ever
-hg rawcommit -p 6 -d "1000000 0" -m7
-hg manifest --debug 7
-hg -v parents
--- a/tests/test-rawcommit1.out Thu May 14 13:20:40 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
-54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
-(the rawcommit command is deprecated)
-05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
-54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
-76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-changeset: 2:e110db3db549
-tag: tip
-user: test
-date: Mon Jan 12 13:46:40 1970 +0000
-files: c
-description:
-2
-
-
-(the rawcommit command is deprecated)
-05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
-76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-changeset: 3:20652cf30cc0
-tag: tip
-user: test
-date: Mon Jan 12 13:46:40 1970 +0000
-files: b
-description:
-3
-
-
-(the rawcommit command is deprecated)
-d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
-76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-changeset: 4:42556b925639
-tag: tip
-user: test
-date: Mon Jan 12 13:46:40 1970 +0000
-files: a
-description:
-4
-
-
-(the rawcommit command is deprecated)
-05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
-54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
-3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
-changeset: 4:42556b925639
-user: test
-date: Mon Jan 12 13:46:40 1970 +0000
-files: a
-description:
-4
-
-
-(the rawcommit command is deprecated)
-d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
-76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-changeset: 6:8a0c9254b0ab
-tag: tip
-parent: 4:42556b925639
-parent: 5:f56d4c64ab98
-user: test
-date: Mon Jan 12 13:46:40 1970 +0000
-description:
-6
-
-
-(the rawcommit command is deprecated)
-d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
-76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-changeset: 7:a5a6e1f312b9
-tag: tip
-user: test
-date: Mon Jan 12 13:46:40 1970 +0000
-description:
-7
-
-