mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +03:00
a6e63bd878
l33t pointed out that currently, Hg-Git doesn't provide any confirmation that a
push was successful other than the exit code. Normal Mercurial provides a
couple other messages followed by "added X changesets with Y changes to
Z files". After this change, Hg-Git will provide much more similar output.
It's not identical, as the underlying model is substantially different, but the
concept is the same. The main message is "added X commits with Y trees and
Z blobs".
This change doesn't affect the output of what references/branches were touched.
That will be addressed in a subsequent commit.
Dulwich doesn't provide an easy hook to get the information needed for this
output. Instead of passing generate_pack_contents as the pack generator
function to send_pack, I pass a custom function that determines the "missing"
objects, stores the counts, and then calls generate_pack_contents (which then
will determine the "missing" objects again.
The new expected output:
searching for changes # unless quiet true
<N> commits found # if verbose true
list of commits: # if debugflag true and at least one commit found
<each hash> # if debugflag true and at least one commit found
adding objects # if at least one commit found unless quiet true
added <N> commits with <N> trees and <N> blobs # if at least one object unless
# quiet true
https://bitbucket.org/durin42/hg-git/issue/64/push-confirmation
66 lines
1.5 KiB
Perl
66 lines
1.5 KiB
Perl
Load commonly used test logic
|
|
$ . "$TESTDIR/testutil"
|
|
|
|
$ git init gitrepo
|
|
Initialized empty Git repository in $TESTTMP/gitrepo/.git/
|
|
$ cd gitrepo
|
|
$ mkdir d1
|
|
$ echo a > d1/f1
|
|
$ echo b > d1/f2
|
|
$ git add d1/f1 d1/f2
|
|
$ fn_git_commit -m initial
|
|
|
|
$ mkdir d2
|
|
$ git mv d1/f2 d2/f2
|
|
$ fn_git_commit -m 'rename'
|
|
|
|
$ rm -r d1
|
|
$ echo c > d1
|
|
$ git add d1
|
|
$ fn_git_commit -m 'replace a dir with a file'
|
|
|
|
|
|
$ cd ..
|
|
$ git init --bare gitrepo2
|
|
Initialized empty Git repository in $TESTTMP/gitrepo2/
|
|
|
|
$ hg clone gitrepo hgrepo | grep -v '^updating'
|
|
importing git objects into hg
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd hgrepo
|
|
$ hg log --template 'adds: {file_adds}\ndels: {file_dels}\n'
|
|
adds: d1
|
|
dels: d1/f1
|
|
adds: d2/f2
|
|
dels: d1/f2
|
|
adds: d1/f1 d1/f2
|
|
dels:
|
|
|
|
$ hg gclear
|
|
clearing out the git cache data
|
|
$ hg push ../gitrepo2
|
|
pushing to ../gitrepo2
|
|
searching for changes
|
|
adding objects
|
|
added 3 commits with 6 trees and 3 blobs
|
|
$ cd ..
|
|
|
|
$ git --git-dir=gitrepo2 log --pretty=medium
|
|
commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:12 2007 +0000
|
|
|
|
replace a dir with a file
|
|
|
|
commit a1874d5cd0b1549ed729e36f0da4a93ed36259ee
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:11 2007 +0000
|
|
|
|
rename
|
|
|
|
commit 102c17a5deda49db3f10ec5573f9378867098b7c
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:10 2007 +0000
|
|
|
|
initial
|