facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity
486 Commits 24 Branches 62 Tags 324 MiB
62185c7a94
Commit Graph

486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Augie Fackler
d772c0bb7d README: remove outdated status, update version requirements. 2010-06-12 21:26:19 -05:00
Augie Fackler
9307310b66 Merge README cleanups. 2010-06-12 21:24:52 -05:00
Augie Fackler
185de4bf07 Merge documentation of in-tree and cleanup of the variable. 2010-06-12 21:23:01 -05:00
Tay Ray Chuan
75b937c19c enforce stricter matching for pull -r 
Use an exact match with the ref name ('foo' in 'refs/heads/foo'),
instead of just checking if it ended with '/foo'.

This allows

  $ hg pull -r foo

to run successfully on a repo containing the branches

 - 'foo',
 - 'mine/foo',
 - 'theirs/foo'
 2010-06-02 20:14:26 +08:00
Augie Fackler
28545e94bc Merge fix from Benoit Allard 2010-06-12 21:19:40 -05:00
Augie Fackler
5518aa1a5a Cope with tags being sorted (hg cset 0376c4f17df5) by backporting that behavior 2010-06-12 21:14:33 -05:00
Augie Fackler
b6ff51f6c0 push: handle argspec change from a00aac92bfb9 2010-06-12 21:12:21 -05:00
Augie Fackler
79f8792213 Bump version 0.2.2 2010-05-22 22:12:11 -05:00
Augie Fackler
04acdf24bd Require dulwich 0.6.0 2010-05-22 22:10:17 -05:00
Benoit Allard
a808ff61ec Fix a traceback when accessing _get_object() on Tag 2010-05-20 00:16:59 +02:00
Tay Ray Chuan
0f4cd1ffa0 README: add 'Commands' section and stubs 2010-05-17 23:00:56 +08:00
Tay Ray Chuan
b881f257a8 README: rename 'Commands' section to 'Usage' 2010-05-17 22:53:18 +08:00
Tay Ray Chuan
5fb45334d6 README: make url conversion more explicit 
Previously, we just threw two clone commands (one for git and one for
hg) at the reader.
 2010-05-17 22:34:23 +08:00
Tay Ray Chuan
8fd67ffa1a README: say 'an explicit protocol prefix' 2010-05-17 22:27:46 +08:00
Tay Ray Chuan
b8d3b6e0b3 README: reword clone command section 
Remove the duplicated "hg clone ..." command, favouring the block
instance over the inline one to emphasize focus on the command.

Also say "hg-git would clone..." instead of "it would clone..." to
minimize disambiguity.

While we're at it, wrap the lines to 80 characters.
 2010-05-17 22:21:12 +08:00
Tay Ray Chuan
ad9c6e444c README: document git.intree 
In 9fa5e81 (Allow storing the git directory intree), hg-git learnt a new
configuration option, but this wasn't documented. Address this.
 2010-05-17 20:37:26 +08:00
Tay Ray Chuan
4b2fb41612 explicitly expect boolean values for git.intree 2010-05-17 20:04:02 +08:00
Tay Ray Chuan
b5ea870e9b README: prefix commands with dollar sign 2010-05-17 19:50:58 +08:00
Tay Ray Chuan
be855526a9 README: use bare-minimum of 4 spaces for code blocks 
Currently, we're using 8 spaces. Although this isn't invalid Markdown
syntax, this causes the readme to rendered on github with additional and
unnecessary indentation.
 2010-05-17 19:49:49 +08:00
Augie Fackler
c9fb39537b Un-break hg 1.3 by adding a compat layer for progress. 2010-04-30 10:35:13 -05:00
Simon Ruderich
d9d8904cc8 README.md: Improve Mercurial to Git conversion description. 2010-04-06 10:20:13 -05:00
Simon Ruderich
5901de8797 README.md: Add information to convert Mercurial to Git. 2010-04-06 10:19:30 -05:00
Augie Fackler
a6ef0b0441 Merge style fix 2010-04-05 19:06:48 -05:00
Augie Fackler
5919da5815 git_handler: prefer () continuation to \ continuation. 2010-04-05 19:06:20 -05:00
Augie Fackler
ba071dd972 setup.py: depend on dulwich 0.5.1 or later 2010-04-05 19:05:18 -05:00
Augie Fackler
07ad6a34c9 Merge test fix. 2010-04-05 18:52:58 -05:00
Tay Ray Chuan
e283322a66 test-pull-after-strip: don't run git-cleanup twice 2010-04-05 13:28:52 +08:00
Tay Ray Chuan
fff9a81fa3 Merge branch 'rc/push-tag' into rc/master 2010-04-04 23:26:46 +08:00
Tay Ray Chuan
58dec6d0a4 when pushing, check if server is advertising annotated tags 
Check if already we have these annotated tags; if so, don't push it.

Update test-git-tags too.
 2010-04-04 23:16:00 +08:00
Tay Ray Chuan
0fa6f2e0fe test-git-tags: test pushing to repo with annotated tags 
Currently, this fails with a 'tag has changed' message.

Additionally, set the receive.denyCurrentBranch config, as we're pushing
a branch to a git repo which has checked out that branch. Also, this is
to handle git after v1.7.0, where that config defaults to "refuse".
 2010-04-04 23:10:10 +08:00
Tay Ray Chuan
e09d350f36 Merge branch 'rc/fix-ann-tags' into rc/master 2010-04-04 19:23:34 +08:00
Tay Ray Chuan
8bce9096c1 update references to Tag.get_object() 
dulwich recently renamed [1] the Tag.get_object() method to
_get_object(). Update our usage correspondingly.

[1] git reference: f85ce56 (Support determining blob id without joining
all chunks first.)
 2010-04-02 20:08:14 +08:00
Tay Ray Chuan
5fae58d6aa handle apply_delta() return value correctly 
dulwich recently changed apply_delta() [1] to return lists. Invoke
join() on the output with an empty string, as dulwich does in its
codebase.

[1] git reference: a2709f6 (Return chunks from apply_delta.)
 2010-04-02 19:56:50 +08:00
Tay Ray Chuan
dbadcb184b update_remote_branches: don't store de-refed tags 
If a git tag is of the annotated-type, the git server sends an
additional line with the SHA-1 the tag dereferences to (eg.
refs/tag/mytag^{}). These aren't "real" tags, so don't store them.
 2010-03-29 13:19:52 +08:00
Tay Ray Chuan
336ec5a893 update_remote_branches: refactor head usage 
Splice the ref name only once, and don't loop through refs/heads
multiple times.

This changes the order in which hg tags are created; update test output
to reflect this.
 2010-03-29 13:19:00 +08:00
Tay Ray Chuan
41495ccdb6 update_remote_branches: don't prepend '/' to heads 
We were saving tracking branches to 'refs/remotes/<remote>//<ref>'
(double slash).
 2010-03-29 13:00:49 +08:00
Tay Ray Chuan
1a2811a633 tests: specify --pretty format 
If the user sets git config --global format.pretty, all hell breaks
loose. Specifying it prevents this.
 2010-03-28 12:21:48 +08:00
Augie Fackler
a18abe29e6 Merge debug message fix. 2010-03-27 22:20:18 -05:00
Augie Fackler
d1961293e0 Various hg 1.4 compat fixes. 2010-03-27 21:37:58 -05:00
Augie Fackler
85fe0468ec test-hg-branch: sed hashes from hg < 1.5 2010-03-27 21:16:41 -05:00
Augie Fackler
4e59f313a6 pull: make it possible to un-wedge the repo after stripping git revs 
This adds a new command, which is inelegant, but it lets you safely
pick up pulling fairly quickly.
 2010-03-25 20:24:00 -05:00
Augie Fackler
65560ee872 hggit: defend against exceptions when pulling with -r 2010-03-25 20:23:00 -05:00
Augie Fackler
c3fa923231 hggit: don't wrap gitrepo with hgrepo 2010-03-25 20:23:00 -05:00
Augie Fackler
5f31688932 tests: many, many changes so we never push into a checked-out ref 2010-03-25 19:54:00 -05:00
Augie Fackler
bf0efb8a3e git_handler: 80 columns cleanup 2010-03-25 19:39:00 -05:00
Augie Fackler
c5bfabbe71 git_handler: fix % formatting in ref errors. 2010-03-25 19:37:00 -05:00
Tay Ray Chuan
23362335d5 export_hg_commit: fix debug note 
We were outputting the raw SHA-1.
 2010-03-22 12:25:33 +08:00
Augie Fackler
fdd03567a1 tests: missed some hash changes last time around 2010-03-03 19:25:29 -06:00
Augie Fackler
7e9ef6943c tests: fix for new sorting of extra in hg and new topological sort 2010-03-03 17:47:00 -06:00
Augie Fackler
3e1ab2fc85 test-git-workflow: work around git output format change 2010-03-03 17:43:01 -06:00