Show More
@@ -789,6 +789,7 b' def backout(ui, repo, rev, **opts):' | |||||
789 | commit_opts['addremove'] = False |
|
789 | commit_opts['addremove'] = False | |
790 | if not commit_opts['message'] and not commit_opts['logfile']: |
|
790 | if not commit_opts['message'] and not commit_opts['logfile']: | |
791 | commit_opts['message'] = _("Backed out changeset %s") % (hex(node)) |
|
791 | commit_opts['message'] = _("Backed out changeset %s") % (hex(node)) | |
|
792 | commit_opts['force_editor'] = True | |||
792 | commit(ui, repo, **commit_opts) |
|
793 | commit(ui, repo, **commit_opts) | |
793 | def nice(node): |
|
794 | def nice(node): | |
794 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
795 | return '%d:%s' % (repo.changelog.rev(node), short(node)) | |
@@ -987,7 +988,8 b' def commit(ui, repo, *pats, **opts):' | |||||
987 | else: |
|
988 | else: | |
988 | files = [] |
|
989 | files = [] | |
989 | try: |
|
990 | try: | |
990 |
repo.commit(files, message, opts['user'], opts['date'], match |
|
991 | repo.commit(files, message, opts['user'], opts['date'], match, | |
|
992 | force_editor=opts.get('force_editor')) | |||
991 | except ValueError, inst: |
|
993 | except ValueError, inst: | |
992 | raise util.Abort(str(inst)) |
|
994 | raise util.Abort(str(inst)) | |
993 |
|
995 |
@@ -446,7 +446,8 b' class localrepository(object):' | |||||
446 | self.dirstate.setparents(n, nullid) |
|
446 | self.dirstate.setparents(n, nullid) | |
447 |
|
447 | |||
448 | def commit(self, files=None, text="", user=None, date=None, |
|
448 | def commit(self, files=None, text="", user=None, date=None, | |
449 |
match=util.always, force=False, lock=None, wlock=None |
|
449 | match=util.always, force=False, lock=None, wlock=None, | |
|
450 | force_editor=False): | |||
450 | commit = [] |
|
451 | commit = [] | |
451 | remove = [] |
|
452 | remove = [] | |
452 | changed = [] |
|
453 | changed = [] | |
@@ -535,8 +536,11 b' class localrepository(object):' | |||||
535 | new.sort() |
|
536 | new.sort() | |
536 |
|
537 | |||
537 | user = user or self.ui.username() |
|
538 | user = user or self.ui.username() | |
538 | if not text: |
|
539 | if not text or force_editor: | |
539 |
edittext = [ |
|
540 | edittext = [] | |
|
541 | if text: | |||
|
542 | edittext.append(text) | |||
|
543 | edittext.append("") | |||
540 | if p2 != nullid: |
|
544 | if p2 != nullid: | |
541 | edittext.append("HG: branch merge") |
|
545 | edittext.append("HG: branch merge") | |
542 | edittext.extend(["HG: changed %s" % f for f in changed]) |
|
546 | edittext.extend(["HG: changed %s" % f for f in changed]) |
@@ -1,19 +1,19 b'' | |||||
1 | # basic operation |
|
1 | # basic operation | |
2 | adding a |
|
2 | adding a | |
3 |
changeset 2: |
|
3 | changeset 2:c86754337410 backs out changeset 1:a820f4f40a57 | |
4 | a |
|
4 | a | |
5 | # file that was removed is recreated |
|
5 | # file that was removed is recreated | |
6 | adding a |
|
6 | adding a | |
7 | adding a |
|
7 | adding a | |
8 |
changeset 2: |
|
8 | changeset 2:d2d961bd79f2 backs out changeset 1:76862dcce372 | |
9 | content |
|
9 | content | |
10 | # backout of backout is as if nothing happened |
|
10 | # backout of backout is as if nothing happened | |
11 | removing a |
|
11 | removing a | |
12 |
changeset 3: |
|
12 | changeset 3:8a7eeb5ab5ce backs out changeset 2:d2d961bd79f2 | |
13 | cat: a: No such file or directory |
|
13 | cat: a: No such file or directory | |
14 | # backout with merge |
|
14 | # backout with merge | |
15 | adding a |
|
15 | adding a | |
16 |
changeset 3: |
|
16 | changeset 3:3c9e845b409c backs out changeset 1:314f55b1bf23 | |
17 | merging with changeset 2:b66ea5b77abb |
|
17 | merging with changeset 2:b66ea5b77abb | |
18 | merging a |
|
18 | merging a | |
19 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
19 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now