facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity
4,742 Commits 24 Branches 62 Tags 322 MiB
a29de605a9
Commit Graph

4742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Mackall
e2973b5e3e strip: pull core strip logic into its own function 2007-06-24 18:22:40 -05:00
Giorgos Keramidas
5f8125a5a3 unbundle: accept multiple file arguments 
update test-bundle for multiple unbundle support
 2007-06-24 10:08:38 -05:00
Eric Hopper
bb53a2c70f convert: handle new cvsps with Tags: and multiple tags. 2007-06-24 07:22:58 -07:00
Matt Mackall
9f3b2a8b06 cat: return an error on failure 2007-06-24 09:47:54 -05:00
Giorgos Keramidas
5a0956cb5a tests: add merge test for changeset 32f6be9c37df 
When all the files in a directory are moved somewhere else, and new
files are added in changesets of the local branch, a subsequent pull
and merge shouldn't rename the locally added files too.
 2007-06-23 22:43:46 -05:00
Emanuele Aina
a6db33bd4a purge: add the clean alias inspired by git-clean and svn-clean 2007-06-23 22:26:22 -05:00
Adam Spiers
84fdb1c81b buildrpm: auto-generate %changelog in .spec file 
Top entry is tip; subsequent entries are the version tags from .hgtags.
 2007-06-03 14:42:39 +01:00
Adam Spiers
befe0e3cb2 mercurial.spec: include CONTRIBUTORS, COPYING and man pages in rpm 2007-06-30 01:21:22 +01:00
Adam Spiers
34346718e5 mercurial.spec: include various utility files from contrib/ in rpm 
Files included:
hgk
convert-repo
hg-ssh
hg-viz
git-rev-tree
bash_completion
zsh_completion
mercurial.el
 2007-06-03 14:40:56 +01:00
NIIMI Satoshi
ad08d10949 mercurial.el: ignore errors on hg-after-save-hook() 
Don't signal an error even if running hg command fails.  Otherwise,
succeeding hooks won't be called.
 2007-05-22 07:24:06 +09:00
NIIMI Satoshi
2d751dee3c mercurial.el: change default log range to tip:0 
If the tip revision is smaller than hg-rev-completion-limit (defaults
to 100), "hg log -r tip:-100" fails.

Since performance does not differ between "hg log -l 50 -r tip:0" and
"hg log -l 50 -r tip:-100" even on large repository, default range can
be changed from "tip:-100" to "tip:0" without any drawbacks.
 2007-05-22 08:05:16 +09:00
paul sorenson
7f3fb6d66f Command in doc comment is now on a single line, fixed 
after previous formatting broke it.
 2007-06-23 22:25:11 -05:00
Emanuele Aina
5968bafc17 purge: don't delete ignored files if --all is not specified 2007-06-06 22:17:35 +02:00
OHASHI Hideya
83f32e7ff9 Enable to select encoding in hgrc web section 
This patch provides character encoding setting in each repository. After this
patch, You can use multi encoding repositories with one mercurial server.
 2007-06-13 18:18:06 +09:00
Thomas Arendsen Hein
2f42bdc4f1 merge with main 2007-06-23 21:11:28 +02:00
Thomas Arendsen Hein
9270e4454c hgk: Use $HG instead of hg (see 9779a8c8d672) 2007-06-23 21:10:55 +02:00
Matt Mackall
aff448fc36 archive: remove spurious flag_bits setting 
This makes zip -T on resulting archives work. File permissions are
still retained.
 2007-06-23 14:02:41 -05:00
Matt Mackall
3791779d22 convert: sometimes git forgets the author 2007-06-23 13:33:45 -05:00
Thomas Arendsen Hein
22ec03c681 hgeditor: Use $HG to run 'hg diff' (see 9779a8c8d672) 2007-06-23 20:22:17 +02:00
Thomas Arendsen Hein
2e76adae49 Remember path to 'hg' executable and pass to external tools and hooks as $HG. 2007-06-23 20:21:10 +02:00
Thomas Arendsen Hein
45612e4757 Merge with main 2007-06-23 12:05:00 +02:00
Alexis S. L. Carvalho
cc6e60f60e merge: fix small bug with a failed merge across a rename 
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
 2007-06-22 20:44:40 -03:00
Alexis S. L. Carvalho
769bdcbb59 transplant: fix locking order 2007-06-22 19:43:29 -03:00
Matt Mackall
8dc00c8475 rollback: update help for issue316 2007-06-22 17:29:49 -05:00
Alexis S. L. Carvalho
e85eaa593d git patches: correct handling of filenames with spaces 
Add a trailing TAB to the "--- filename" lines if there's a space
in the file name.  This allows patch(1) to work correctly.  The
same is done for diff --nodates.

This was originally suggested by Andrei Vermel, but at the time
I thought git was doing something different.
 2007-06-22 19:06:04 -03:00
Alexis S. L. Carvalho
b8f177ebbe Work around urllib2 digest auth bug with Python < 2.5 
This should fix issue570.
 2007-06-22 14:32:54 -03:00
Alexis S. L. Carvalho
64a37442ed dirstate.status: if a file is marked as copied, consider it modified 
After a "hg copy --force --after somefile cleanfile", cleanfile
shouldn't be considered clean anymore.
 2007-06-21 23:42:06 -03:00
Matt Mackall
265560b37a Merge with Eric Hopper 2007-06-21 18:05:14 -05:00
Matt Mackall
a38809cf9e merge: warn user about divergent renames 2007-06-21 18:02:03 -05:00
Patrick Mezard
21ea8128a8 Merge with crew 2007-06-21 22:19:41 +02:00
Marcos Chaves
f5c072cbc9 Handle CTRL+C in serve under Windows. 2007-06-21 21:58:18 +02:00
Matt Mackall
613a7dfcea identify: take a path to a remote repo 
Rather than using -R, we take a path as an argument. This lets us use
url#branch syntaxes that may be in hgrc.
 2007-06-21 13:09:01 -05:00
Matt Mackall
f0400ad7b9 dispatch: parse local hgrc for paths 2007-06-21 13:09:00 -05:00
Eric Hopper
964ff0a5e3 Change branches to sort 'active' branches first, and add an option to show only active branches. 2007-06-21 10:40:09 -07:00
Thomas Arendsen Hein
1b20c30e25 hgweb_mod.archive(): Use 'key' instead of builtin 'id'. 2007-06-21 19:38:44 +02:00
Thomas Arendsen Hein
9a78cd828a Remove useless variable assignments in util.opener. 
The original idea might have been to prevent circular references, but
as this assignment would have created another reference, this makes
no difference.
 2007-06-21 19:24:27 +02:00
Matt Mackall
b5a98f60fd identify: work with remote repos 2007-06-21 11:54:16 -05:00
Matt Mackall
7d837ca833 identify: add support for output flags 2007-06-21 11:54:13 -05:00
Matt Mackall
a0395f3952 identify: accept a revision argument 2007-06-21 11:54:11 -05:00
Matt Mackall
0ca818e7d0 identify: use contexts 2007-06-21 11:42:39 -05:00
Matt Mackall
7be33e5057 context: add tags() method 2007-06-21 11:42:39 -05:00
Matt Mackall
1f80f939a9 identify: show nullid for empty repo 2007-06-21 11:42:39 -05:00
Thomas Arendsen Hein
f1c2183cb0 Backed out changeset 6e4b2043f10ea50b3eeb0ceb3e8776032fb8d92e 
Only printenv was changed, not the actual execution of hooks.
And not setting an empty value might cause problems on platforms
which can't always remove variables from the environment.
 2007-06-21 10:00:59 +02:00
Thomas Arendsen Hein
4df6409ef2 Adjust note about variables not being set for empty values. 2007-06-21 09:45:33 +02:00
Thomas Arendsen Hein
3019bb7a0b Kill trailing spaces 2007-06-21 09:25:49 +02:00
Alexis S. L. Carvalho
1d182cc78a mq: test that qpush cleans things up when it fails 2007-06-21 00:34:14 -03:00
Alexis S. L. Carvalho
d4cae7d8a5 dirstate.invalidate: clear dirty flag 2007-06-21 00:34:14 -03:00
Alexis S. L. Carvalho
3beeb3356f dirstate: fix typo 2007-06-21 00:34:14 -03:00
Alexis S. L. Carvalho
2bdde5e379 update the output of test-help and test-globalopts 2007-06-21 00:34:14 -03:00
Brendan Cully
f7e826dad3 Fix dispatch error message when not in a repo 2007-06-20 20:13:31 -07:00