mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
63bb40f9c4
Summary: Those messages like "pulling from ...", "added n commits ..." belong to stderr. This makes it possible for us to turn on verbose output for auto pull, without breaking tools that parses stdout. Reviewed By: sfilipco Differential Revision: D25315955 fbshipit-source-id: 933f631610840eb5f603ad817f7560c78b19e4ad
95 lines
2.4 KiB
Perl
95 lines
2.4 KiB
Perl
#chg-compatible
|
|
|
|
$ enable histedit
|
|
|
|
$ initrepos ()
|
|
> {
|
|
> hg init r
|
|
> cd r
|
|
> for x in a b c ; do
|
|
> echo $x > $x
|
|
> hg add $x
|
|
> hg ci -m $x
|
|
> done
|
|
> cd ..
|
|
> hg clone r r2 2>&1 | grep -v updating
|
|
> cd r2
|
|
> for x in d e f ; do
|
|
> echo $x > $x
|
|
> hg add $x
|
|
> hg ci -m $x
|
|
> done
|
|
> cd ..
|
|
> hg init r3
|
|
> cd r3
|
|
> for x in g h i ; do
|
|
> echo $x > $x
|
|
> hg add $x
|
|
> hg ci -m $x
|
|
> done
|
|
> cd ..
|
|
> }
|
|
|
|
$ initrepos
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
show the edit commands offered by outgoing
|
|
$ cd r2
|
|
$ HGEDITOR=cat hg histedit --outgoing ../r 2>&1 | grep -v comparing 2>&1 | grep -v searching
|
|
pick 055a42cdd887 d
|
|
pick e860deea161a e
|
|
pick 652413bf663e f
|
|
|
|
# Edit history between 055a42cdd887 and 652413bf663e
|
|
#
|
|
# Commits are listed from least to most recent
|
|
#
|
|
# You can reorder changesets by reordering the lines
|
|
#
|
|
# Commands:
|
|
#
|
|
# e, edit = use commit, but stop for amending
|
|
# m, mess = edit commit message without changing commit content
|
|
# p, pick = use commit
|
|
# b, base = checkout changeset and apply further changesets from there
|
|
# d, drop = remove commit from history
|
|
# f, fold = use commit, but combine it with the one above
|
|
# r, roll = like fold, but discard this commit's description and date
|
|
#
|
|
$ cd ..
|
|
|
|
show the error from unrelated repos
|
|
$ cd r3
|
|
$ HGEDITOR=cat hg histedit --outgoing ../r 2>&1 | grep -v comparing 2>&1 | grep -v searching
|
|
abort: repository is unrelated
|
|
$ cd ..
|
|
|
|
show the error from unrelated repos
|
|
$ cd r3
|
|
$ HGEDITOR=cat hg histedit --force --outgoing ../r
|
|
comparing with ../r
|
|
searching for changes
|
|
warning: repository is unrelated
|
|
pick 2a4042b45417 g
|
|
pick 68c46b4927ce h
|
|
pick 51281e65ba79 i
|
|
|
|
# Edit history between 2a4042b45417 and 51281e65ba79
|
|
#
|
|
# Commits are listed from least to most recent
|
|
#
|
|
# You can reorder changesets by reordering the lines
|
|
#
|
|
# Commands:
|
|
#
|
|
# e, edit = use commit, but stop for amending
|
|
# m, mess = edit commit message without changing commit content
|
|
# p, pick = use commit
|
|
# b, base = checkout changeset and apply further changesets from there
|
|
# d, drop = remove commit from history
|
|
# f, fold = use commit, but combine it with the one above
|
|
# r, roll = like fold, but discard this commit's description and date
|
|
#
|
|
$ cd ..
|
|
|