This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9255

split: use default one-line summary
ClosedPublic

Authored by martinvonz on Oct 28 2020, 11:41 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG84ce9ffc95ad: split: use default one-line summary

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mhgext/split.py (4 lines)
Mtests/test-split.t (14 lines)

Diff 23315

hgext/split.py

# Main split loop # Main split loop
while incomplete(repo): while incomplete(repo):
if committed: if committed:
header = _( header = _(
b'HG: Splitting %s. So far it has been split into:\n' b'HG: Splitting %s. So far it has been split into:\n'
) % short(ctx.node()) ) % short(ctx.node())
for c in committed: for c in committed:
firstline = c.description().split(b'\n', 1)[0] summary = cmdutil.format_changeset_summary(ui, c, b'split')
header += _(b'HG: - %s: %s\n') % (short(c.node()), firstline) header += _(b'HG: - %s\n') % summary
header += _( header += _(
b'HG: Write commit message for the next split changeset.\n' b'HG: Write commit message for the next split changeset.\n'
) )
else: else:
header = _( header = _(
b'HG: Splitting %s. Write commit message for the ' b'HG: Splitting %s. Write commit message for the '
b'first split changeset.\n' b'first split changeset.\n'
) % short(ctx.node()) ) % short(ctx.node())

tests/test-split.t

@@ -3,1 +3,1 @@ 2 @@ -3,1 +3,1 @@ 2
-3 -3
+33 +33
record change 2/2 to 'a'? record change 2/2 to 'a'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y
EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into: EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:
EDITOR: HG: - e704349bd21b: split 1 EDITOR: HG: - 2:e704349bd21b tip "split 1"
EDITOR: HG: Write commit message for the next split changeset. EDITOR: HG: Write commit message for the next split changeset.
EDITOR: a2 EDITOR: a2
EDITOR: EDITOR:
EDITOR: EDITOR:
EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
EDITOR: HG: Leave message empty to abort commit. EDITOR: HG: Leave message empty to abort commit.
EDITOR: HG: -- EDITOR: HG: --
EDITOR: HG: user: test EDITOR: HG: user: test
EDITOR: HG: branch 'default' EDITOR: HG: branch 'default'
EDITOR: HG: changed a EDITOR: HG: changed a
diff --git a/a b/a diff --git a/a b/a
1 hunks, 1 lines changed 1 hunks, 1 lines changed
examine changes to 'a'? examine changes to 'a'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-1 -1
+11 +11
record this change to 'a'? record this change to 'a'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y
EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into: EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:
EDITOR: HG: - e704349bd21b: split 1 EDITOR: HG: - 2:e704349bd21b tip "split 1"
EDITOR: HG: - a09ad58faae3: split 2 EDITOR: HG: - 3:a09ad58faae3 "split 2"
EDITOR: HG: Write commit message for the next split changeset. EDITOR: HG: Write commit message for the next split changeset.
EDITOR: a2 EDITOR: a2
EDITOR: EDITOR:
EDITOR: EDITOR:
EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
EDITOR: HG: Leave message empty to abort commit. EDITOR: HG: Leave message empty to abort commit.
EDITOR: HG: -- EDITOR: HG: --
EDITOR: HG: user: test EDITOR: HG: user: test
EDITOR: HG: changed bar EDITOR: HG: changed bar
created new head created new head
diff --git a/foo b/foo diff --git a/foo b/foo
1 hunks, 1 lines changed 1 hunks, 1 lines changed
examine changes to 'foo'? examine changes to 'foo'?
(enter ? for help) [Ynesfdaq?] f (enter ? for help) [Ynesfdaq?] f
EDITOR: HG: Splitting dd3c45017cbf. So far it has been split into: EDITOR: HG: Splitting dd3c45017cbf. So far it has been split into:
EDITOR: HG: - f205aea1c624: split 1 EDITOR: HG: - 2:f205aea1c624 tip "split 1"
EDITOR: HG: Write commit message for the next split changeset. EDITOR: HG: Write commit message for the next split changeset.
EDITOR: splitme EDITOR: splitme
EDITOR: EDITOR:
EDITOR: EDITOR:
EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
EDITOR: HG: Leave message empty to abort commit. EDITOR: HG: Leave message empty to abort commit.
EDITOR: HG: -- EDITOR: HG: --
EDITOR: HG: user: test EDITOR: HG: user: test
EDITOR: HG: changed bar EDITOR: HG: changed bar
created new head created new head
diff --git a/foo b/foo diff --git a/foo b/foo
2 hunks, 2 lines changed 2 hunks, 2 lines changed
examine changes to 'foo'? examine changes to 'foo'?
(enter ? for help) [Ynesfdaq?] f (enter ? for help) [Ynesfdaq?] f
EDITOR: HG: Splitting 904c80b40a4a. So far it has been split into: EDITOR: HG: Splitting 904c80b40a4a. So far it has been split into:
EDITOR: HG: - ffecf40fa954: split 1 EDITOR: HG: - 2:ffecf40fa954 tip "split 1"
EDITOR: HG: Write commit message for the next split changeset. EDITOR: HG: Write commit message for the next split changeset.
EDITOR: splitme EDITOR: splitme
EDITOR: EDITOR:
EDITOR: EDITOR:
EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
EDITOR: HG: Leave message empty to abort commit. EDITOR: HG: Leave message empty to abort commit.
EDITOR: HG: -- EDITOR: HG: --
EDITOR: HG: user: test EDITOR: HG: user: test
EDITOR: HG: removed file EDITOR: HG: removed file
created new head created new head
diff --git a/file2 b/file2 diff --git a/file2 b/file2
1 hunks, 2 lines changed 1 hunks, 2 lines changed
examine changes to 'file2'? examine changes to 'file2'?
(enter ? for help) [Ynesfdaq?] a (enter ? for help) [Ynesfdaq?] a
EDITOR: HG: Splitting 8c42fa635116. So far it has been split into: EDITOR: HG: Splitting 8c42fa635116. So far it has been split into:
EDITOR: HG: - 478be2a70c27: split1, keeping only the numbered lines EDITOR: HG: - 2:478be2a70c27 tip "split1, keeping only the numbered lines"
EDITOR: HG: Write commit message for the next split changeset. EDITOR: HG: Write commit message for the next split changeset.
EDITOR: move and modify EDITOR: move and modify
EDITOR: EDITOR:
EDITOR: EDITOR:
EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
EDITOR: HG: Leave message empty to abort commit. EDITOR: HG: Leave message empty to abort commit.
EDITOR: HG: -- EDITOR: HG: --
EDITOR: HG: user: test EDITOR: HG: user: test
EDITOR: HG: changed file EDITOR: HG: changed file
created new head created new head
diff --git a/file2 b/file2 diff --git a/file2 b/file2
1 hunks, 2 lines changed 1 hunks, 2 lines changed
examine changes to 'file2'? examine changes to 'file2'?
(enter ? for help) [Ynesfdaq?] a (enter ? for help) [Ynesfdaq?] a
EDITOR: HG: Splitting 41c861dfa61e. So far it has been split into: EDITOR: HG: Splitting 41c861dfa61e. So far it has been split into:
EDITOR: HG: - 4b19e06610eb: split1, keeping "file" and only the numbered lines in file2 EDITOR: HG: - 2:4b19e06610eb tip "split1, keeping "file" and only the numbered lines in file2"
EDITOR: HG: Write commit message for the next split changeset. EDITOR: HG: Write commit message for the next split changeset.
EDITOR: copy file->file2, modify both EDITOR: copy file->file2, modify both
EDITOR: EDITOR:
EDITOR: EDITOR:
EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
EDITOR: HG: Leave message empty to abort commit. EDITOR: HG: Leave message empty to abort commit.
EDITOR: HG: -- EDITOR: HG: --
EDITOR: HG: user: test EDITOR: HG: user: test