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
5,299 Commits 24 Branches 62 Tags 322 MiB
e38e06ffb3
Commit Graph

3289 Commits

Author SHA1 Message Date
Matt Mackall
2cb4c11520 revlog: add a magic null revision to our index 
We expand our index by one entry so that index[nullrev] points to a
unique entry, the null revision. This naturally eliminates numerous
extra tests in the performance-sensitive index access functions, most
of which are now trivial again.

Adding new entries is now done with insert(-1, e) rather than
append(e).
 2007-07-23 20:44:08 -05:00
Matt Mackall
f03d3e07aa revlog: change accesses to index entry elements to use positive offsets 2007-07-23 20:44:08 -05:00
Matt Mackall
04b4378f47 revlog: parse revlogv0 indexes into v1 internally 
This lets us eliminate lots of special case code in our
performance-sensitive index accessors.
 2007-07-23 20:44:08 -05:00
Matt Mackall
70e7477200 revlog: only allow lazy parsing with revlogng files 
This will allow us to store indices in memory in a single entry format
 2007-07-23 20:44:08 -05:00
Matt Mackall
214f50b511 revlog: simplify the v1 immediate parser 
- read all the data at once (large files are handled by the lazy parser)
- cache the entire file for inline revlogs
- simplify looping
 2007-07-23 20:44:08 -05:00
Matt Mackall
3b9167f022 revlog: set the threshold for lazy parsing higher 
A typical machine can parse a 1MB index in well under a second
 2007-07-23 20:44:08 -05:00
Matt Mackall
1889aee8b0 revlog: simplify the v0 parser 2007-07-23 20:44:07 -05:00
Matt Mackall
e7ef5dc500 revlog: add revlogio interface 
This lets us separate the logic for different on-disk revlog formats from
the main revlog logic.
 2007-07-23 20:44:07 -05:00
Matt Mackall
2158f34c5f revlog: regroup parsing code 2007-07-23 20:44:07 -05:00
Matt Mackall
3dfe783ec5 transactions: avoid late tear-down (issue641) 
We use weak references (ugh) to avoid having to manually delete
transaction references out of each call frame when an exception occurs.
 2007-07-22 14:53:57 -05:00
Thomas Arendsen Hein
b35814d4c2 merge with crew-stable 2007-07-22 09:45:18 +02:00
Bryan O'Sullivan
a09e8936ae addremove: print meaningful error message if --similar not numeric 2007-07-21 19:07:18 -07:00
Matt Mackall
cd72dc7f1b Merge with crew 2007-07-21 16:44:38 -05:00
Matt Mackall
d5b7eaa69a revlog: privatize some methods 2007-07-21 16:18:42 -05:00
Matt Mackall
0e54e000c1 revlog: delete unused function makenode 2007-07-21 16:18:24 -05:00
Matt Mackall
9eea27ad83 revlog: raise offset/type helpers to global scope 2007-07-21 16:18:21 -05:00
Matt Mackall
3a3bd8ec5b Make repo locks recursive, eliminate all passing of lock/wlock 2007-07-21 16:02:10 -05:00
Matt Mackall
3fdaa5a42e Use a weakref for recursive transactions 2007-07-21 16:02:10 -05:00
Matt Mackall
3e13c68628 Use try/finally pattern to cleanup locks and transactions 2007-07-21 16:02:10 -05:00
Matt Mackall
5a93a0feb4 repo locks: use True/False 2007-07-21 16:02:09 -05:00
Matt Mackall
ce5b3192db rename and simplify do_lock 2007-07-21 16:02:09 -05:00
Matt Mackall
7cdcc1b36f simplify dirstate fixups in repo.status() 2007-07-21 16:02:09 -05:00
Matt Mackall
450dc6247d dirstate: add doesn't need to call stat 2007-07-21 16:02:09 -05:00
Matt Mackall
60107c9e5e use context for part of localrepo status 2007-07-21 16:02:09 -05:00
Matt Mackall
410e8d67c6 context: add __contains__, __getitem__, and __iter__ 2007-07-21 16:02:09 -05:00
Matt Mackall
81e9f172fb dirstate: get rid of default args for status 2007-07-21 16:02:09 -05:00
Matt Mackall
43547721ea dirstate: make filterfiles private 2007-07-21 16:02:09 -05:00
Matt Mackall
c2967290a5 dirstate: add __contains__ and make __getitem__ more useful 
dirstate.state(f) == '?' -> f not in dirstate
dirstate.state(f) -> dirstate[f]
 2007-07-21 16:02:09 -05:00
Matt Mackall
bab511ec55 dirstate: make wjoin function private 2007-07-21 16:02:09 -05:00
Matt Mackall
cf691df912 dirstate: break update into separate functions 2007-07-21 16:02:09 -05:00
Matt Mackall
1a40b796d1 dirstate: use True and false for _dirty 2007-07-21 16:02:09 -05:00
Thomas Arendsen Hein
a974129de3 merge with crew-stable 2007-07-21 17:37:39 +02:00
Thomas Arendsen Hein
dbdc09ab03 Make [defaults] in .hg/hgrc work. 2007-07-21 17:36:45 +02:00
Thomas Arendsen Hein
def3b1c2ba Use format string for lockname again (was changed by cb157328a155) 2007-07-21 10:39:42 +02:00
Thomas Arendsen Hein
d9d3256252 removed trailing whitespace 2007-07-21 10:30:51 +02:00
Benoit Boissinot
8c722d66b2 fix bogus close spotted by pychecker (no close() in global scope) 2007-07-20 09:44:50 +02:00
Benoit Boissinot
84d45c7794 fix unused variables reported by pychecker 2007-07-20 09:31:32 +02:00
Alexis S. L. Carvalho
afb05aff16 dirstate.invalidate: avoid rebuilding _map 
Since hasattr will call __getattr__, the call to hasattr(self, '_dirs')
will end up reparsing the dirstate file.
 2007-07-19 19:43:25 -03:00
Alexis S. L. Carvalho
534a817230 add dirstate._dirtypl variable 
Theoretically, it's possible to forget modified dirstate
parents by doing:

dirstate.invalidate()
dirstate.setparents(p1, p2)
dirstate._map

The final access to _map should call _read(), which will
unconditionally overwrite dirstate._pl.

This doesn't actually happen right now because invalidate
accidentally ends up rebuilding dirstate._map.
 2007-07-19 19:43:25 -03:00
Alexis S. L. Carvalho
563893de20 archive: delay extraction of file revisions 
This allows us to look only at the filelogs we're interested in,
providing a nice speedup if we're archiving only part of a repository.
 2007-07-19 19:43:25 -03:00
Alexis S. L. Carvalho
e0b6efcdbf help: avoid traceback if an extension has only debug commands 2007-07-19 19:43:25 -03:00
Alexis S. L. Carvalho
a8e3b41c40 merge with crew-stable 2007-07-19 19:48:24 -03:00
Bryan O'Sullivan
a7c1cdf4bc Print meaningful error message if os.symlink fails 2007-07-19 15:29:33 -07:00
Bryan O'Sullivan
cd2a579d50 lock.py: cache hostname, but not pid, in case we fork 2007-07-19 15:13:48 -07:00
Bryan O'Sullivan
8d0f81f7cc Simplify update. 2007-07-18 14:00:55 -07:00
Bryan O'Sullivan
5930d0695b Simplify update. 2007-07-18 14:00:55 -07:00
Bryan O'Sullivan
f645e069a4 Better fix for issue 622 than we had in 287a2fbd37b0. 2007-07-18 13:56:08 -07:00
Bryan O'Sullivan
261434d5a1 Better fix for issue 622 than we had in 287a2fbd37b0. 2007-07-18 13:56:08 -07:00
Patrick Mezard
dd336a8d1a patch: patches should be read and written in binary mode when possible. 2007-07-17 23:35:24 +02:00
Patrick Mezard
ccc14e4990 patch: fix normalized paths separators. 2007-07-17 23:34:52 +02:00
Patrick Mezard
4a8150bcb8 posixfile_nt: '+' was understood as read mode instead of update. 2007-07-17 23:33:42 +02:00
Patrick Mezard
3979bd753f posixfile_nt: '+' was understood as read mode instead of update. 2007-07-17 23:33:42 +02:00
Bryan O'Sullivan
6c741e45c0 patch.py: re-add the ability to use an external patch program 
This is now invoked by default only if ui.patch is set.  Otherwise, we
use our built-in patch.  If that fails because it can't find any valid
hunks, we'll fall back to trying the external patch command.
 2007-07-17 09:39:30 -07:00
Bryan O'Sullivan
78c5b7bde0 patch.py: don't mark files as changed unless they have actually been changed 2007-07-17 09:39:30 -07:00
Bryan O'Sullivan
691d74d7d4 patch.py: fix some incorrect uses of _() for i18n 2007-07-17 09:39:30 -07:00
Bryan O'Sullivan
590b9213d3 Add Chris Mason's mpatch library. 
The original repo is http://oss.oracle.com/mercurial/mason/mpatch
 2007-07-17 09:39:30 -07:00
Alexis S. L. Carvalho
ae58d97874 merge with crew-stable 2007-07-17 09:28:01 -03:00
Alexis S. L. Carvalho
4770c831b2 hg parents: don't pass an OS-specific path to repo.filectx 
The only reason to use the matcher code instead of calling util.canonpath
directly is to be able to use "path:canonical/path/to/file" patterns.
 2007-07-17 09:08:29 -03:00
Thomas Arendsen Hein
26fba570c8 merge with main 2007-07-17 08:22:43 +02:00
Bryan O'Sullivan
c824069322 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) 
This also fixes an asymmetry bug in which we called the pretag hook if we
were going to create a local tag, but didn't call the tag hook afterwards.
 2007-07-16 20:15:03 -07:00
Bryan O'Sullivan
39c3672fd0 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) 
This also fixes an asymmetry bug in which we called the pretag hook if we
were going to create a local tag, but didn't call the tag hook afterwards.
 2007-07-16 20:15:03 -07:00
Bryan O'Sullivan
e2e04c39f7 issue 622: pull/unbundle -u updates to default branch if repo was empty 2007-07-16 18:01:20 -07:00
Bryan O'Sullivan
ef448328f7 issue 622: pull/unbundle -u updates to default branch if repo was empty 2007-07-16 18:01:20 -07:00
Matt Mackall
642976187f contexts: improve filectx eq test 2007-07-16 17:39:03 -05:00
Matt Mackall
90ef8d6105 Merge with -stable 2007-07-16 17:30:34 -05:00
Matt Mackall
1e9e9e4cdd merge: fix unnecessary rename merges on linear update (issue631) 
If one side's revision is identical to the ancestor, we skip the rest
of the copy detection logic.
 2007-07-15 14:43:38 -05:00
Matt Mackall
86ab3ea033 Merge with -stable 2007-07-14 13:34:40 -05:00
Matt Mackall
6a7cb8cbaa diff: correctly handle combinations of whitespace options 2007-07-14 12:44:47 -05:00
Jesse Glick
5b3c852e55 typo fix 2007-07-12 10:55:49 -04:00
Brendan Cully
d4bd9b2ed8 replace .hgtags instead of appending to it when doing a raw commit 2007-07-11 00:53:44 -07:00
Brendan Cully
cd14b55f6f handle nonexistent .hgtags in raw _tag 2007-07-11 00:34:35 -07:00
Brendan Cully
5c862af489 archive: abort on empty repository. Fixes #624. 2007-07-10 10:06:24 -07:00
Giorgos Keramidas
827573f6ad hg grep: handle re.compile errors & update tests/test-grep 2007-07-09 17:41:14 +03:00
Alexis S. L. Carvalho
e4f786c463 archive: make the %r escape work. 2007-07-11 19:56:16 -03:00
Alexis S. L. Carvalho
3b07689b6a serve: respect settings from .hg/hgrc 
create_server was looking only at the root ui object, ignoring any
settings from .hg/hgrc.  To keep respecting command-line arguments,
commands.serve must also call repo.ui.setconfig.
 2007-07-11 19:56:16 -03:00
Christian Ebert
7a47878736 Use isinstance instead of type == type 2007-07-06 12:02:43 +02:00
Wesley J. Landaker
49f06e37cf Use wsgi.url_scheme instead of ad-hoc CGI checks. 
Instead of each place in hgweb_mod that needs to check for SSL or get
the protocol scheme (http vs. https) doing it ad-hoc, make them just
look at the wsgi.url_scheme which because of previous patches is now
always set correctly.
 2007-07-12 22:55:44 -07:00
Brendan Cully
a0b3ae0fbb cosmetics 2007-07-12 22:44:16 -07:00
Wesley J. Landaker
90ae651c49 Make hg serve set the wsgi.url_scheme property correctly. 
This fixes the bug where hg serve with SSL will always detect the wrong
urlbase for templates. This is also part of unifying the CGI interface
and hg serve interface to both use standard wsgi.
 2007-07-12 13:58:36 -06:00
Wesley J. Landaker
feb6c32251 Handle CGI SSL detection via HTTPS environment better. 
Some servers send on/off, 0/1, yes/no, and may be upper or lower case.
This fix will handle all of those permutations. It was inspired by the
detection done in in some other wsgi python web applications I looked at.
 2007-07-12 13:55:20 -06:00
Alexis S. L. Carvalho
05dd580e30 merge with crew-stable 2007-07-11 20:15:03 -03:00
Wesley J. Landaker
034dcaed92 Make {urlbase} work in templates when https is used. 2007-07-10 10:54:54 -06:00
Brendan Cully
cd69031532 replace .hgtags instead of appending to it when doing a raw commit 2007-07-11 00:53:44 -07:00
Brendan Cully
c685e57a99 handle nonexistent .hgtags in raw _tag 2007-07-11 00:34:35 -07:00
Brendan Cully
7530fee196 Export extra in _tag so convert can set the branch of a tag 2007-07-11 00:04:15 -07:00
Brendan Cully
5421e55633 archive: abort on empty repository. Fixes #624. 2007-07-10 10:06:24 -07:00
Brendan Cully
4654693aa4 Add SSL support to hg serve, activated via --certificate option 2007-07-09 22:12:28 -07:00
Thomas Arendsen Hein
5a9970a155 Add --line-number option to hg annotate (issue506) 
Line numbers are separated from the last annotation element with a colon,
like with many other commands, e.g. (hg) grep or compiler errors.

Idea and tests by FUJIWARA Katsunori.
 2007-07-08 19:59:02 +02:00
FUJIWARA Katsunori
03774e057f Allow filectx.annotate to return the line number of first appearance. 2007-07-08 19:46:04 +02:00
Thomas Arendsen Hein
a5d49326c9 merge with crew-stable 2007-07-08 12:59:58 +02:00
Thomas Arendsen Hein
898f48cc24 hg log: Move filtering implicit parents to own method and use it in templater. 
Extended test repo in test-command-template to contain changeset to test this.
 2007-07-08 12:52:08 +02:00
Thomas Arendsen Hein
a0ef6536ad Strip whitespace from changeset description in changeset_templater. 
changeset_printer already does this, too.
 2007-07-08 10:43:57 +02:00
Thomas Arendsen Hein
d486a44410 Removed deprecated hg:// and old-http:// protocols (issue406) 2007-07-08 09:54:42 +02:00
Brendan Cully
d2d845d908 hgwebdir: check for repo foo before browsing subdirectories of foo/ 2007-07-07 21:55:56 -07:00
Brendan Cully
61aceec68e Merge with crew 2007-07-07 15:09:28 -07:00
Brendan Cully
5d30097ec4 hgweb: browse subdirectories before checking whether parent directory is also a repository 2007-07-07 15:09:08 -07:00
Thomas Arendsen Hein
78616ff36e Use a prefix for debuginstall tempfiles. 
This way you know where the files came from if they don't get removed.
 2007-07-07 20:52:31 +02:00
Brendan Cully
864d59c393 python 2.3 does not have sorted 2007-07-06 10:29:09 -07:00
Brendan Cully
ee78cfbb39 Sort changelog extra dict to avoid possible nondeterminism 2007-07-06 10:22:22 -07:00
Brendan Cully
4750025032 Last change broke new-style URLs 2007-07-06 10:11:48 -07:00
Brendan Cully
d31b7d1fa4 hgwebdir: do not walk up the given path looking for a repository. It is there or it isn't. 2007-07-06 09:15:17 -07:00
Brendan Cully
2216ff4225 hgwebdir: show only trailing part of path when browsing subdirectories 2007-07-05 19:56:16 -07:00
Brendan Cully
10f4d33bdf hgweb: let hgwebdir browse subdirectories 2007-07-05 19:44:06 -07:00
Matt Mackall
e3e7be0bf0 Merge with stable 2007-07-05 16:17:01 -05:00
Matt Mackall
aa6e63596e Merge with crew-stable 2007-07-05 16:15:57 -05:00
Matt Mackall
d00f8a1d6c merge: fix adding untracked files on directory rename (issue612) 
Fix from Brendan
Added test case
 2007-07-05 16:01:07 -05:00
Matt Mackall
dc9134201b extensions: untangle some recursive dependencies 2007-07-05 15:37:23 -05:00
Matt Mackall
cfe7a0a522 merge: make test for fast-forward merge stricter (issue619) 
don't allow merging with an ancestor
fix != on contexts
add a test
 2007-07-05 13:34:18 -05:00
Patrick Mezard
cd13d33922 Fix issue589 wording problem 2007-07-05 19:13:08 +02:00
Thomas Arendsen Hein
d01208a3d1 Fixed calling the merge script and reporting errors in debuginstall (issue617) 2007-07-04 09:20:56 +02:00
Thomas Arendsen Hein
2501b7aeac Fix revlog.children so the real children of the null revision can be calculated. 2007-07-03 12:45:33 +02:00
Alexis S. L. Carvalho
f9b8c79d22 hgweb: use lrwxrwxrwx as the permissions of a symlink 2007-07-03 03:06:40 -03:00
Alexis S. L. Carvalho
8c2c88e404 Make hg add foo; hg mv foo bar work. 
- foo will be removed (the user has a copy of its contents in bar)

- bar will not be marked as a copy (there was no committed version of foo).
  We print a warning telling that to the user.

Fixes issue269.
 2007-07-03 03:06:40 -03:00
Thomas Arendsen Hein
12ab0bc744 Added full URL to debug output if something doesn't look like an http hg repo. 
This way it is easier to debug problems with failing subcommands, like
changegroupsubset due to permission problems, when generally accessing
the repository works fine.
 2007-06-29 11:13:36 +02:00
Brendan Cully
b1034db3e9 Handle extensions with defined but empty cmdtable 2007-06-28 21:16:25 -07:00
Thomas Arendsen Hein
4784c1900b Abort if earlygetopt fails to detect an option. 
Otherwise it could happen that a command is used on the wrong repository,
because abbreviations of --cwd or --repository were ignored.
 2007-06-28 16:03:45 +02:00
Thomas Arendsen Hein
780c8f7779 Simplified earlygetopt and made it remove parsed options and values. 
The order of aliases is no longer important, too.
 2007-06-28 15:56:25 +02:00
Matt Mackall
424fd43f0f Merge with stable 2007-07-05 15:36:56 -05:00
Patrick Mezard
1b80abfc56 Merge with crew-stable 2007-07-05 20:50:24 +02:00
Thomas Arendsen Hein
33e8cbea79 merge with crew-stable 2007-07-04 09:24:19 +02:00
Thomas Arendsen Hein
cbfe4f2de9 merge with crew-stable 2007-07-03 12:46:34 +02:00
Alexis S. L. Carvalho
f6cedde7e0 merge with crew-stable 2007-07-03 03:14:18 -03:00
Brendan Cully
e8ad904a56 patch.extract: fix test-import breakage introduced in the previous changeset 2007-07-02 13:26:12 -07:00
Brendan Cully
099f763bc1 patch.extract: do not prepend subject if the description already starts with it 2007-07-02 10:59:16 -07:00
Thomas Arendsen Hein
e10fcd1450 Disallow short earlygetop option combined with other short options 
While "hg commit -qRfoo" can be read as "--quiet --repository foo",
"hg commit -mRfoo" should be "--message Rfoo".
 2007-06-27 20:37:33 +02:00
csaba.henk@creo.hu
b3d7f22dba Fix tgz archival on Windows. 
Making tgz's on Windows has been broken by 4183b5f64f62
due to not being careful enough about binary mode opens.
 2007-06-27 08:35:26 -07:00
Thomas Arendsen Hein
0b7147a667 Updated command tables in commands.py and hgext extensions. 
- Marked for translation where extensions already had _()
- Corrected indentation
- fixed a few synopsises
 2007-06-26 22:38:57 +02:00
Thomas Arendsen Hein
c6d47ef08c Catch illegal boolean values in hgrc nicely. 
With hg 0.9.3 the section and parameter name wasn't printed,
with hg 0.9.4 there was a traceback for ValueError.
 2007-06-26 20:37:15 +02:00
Thomas Arendsen Hein
1dcdb0a53a Fix earlygetop for short options with unnecessary spaces removed 
Examples:
 hg log -qR foo
 hg log -Rfoo
 hg log -qRfoo
 2007-06-26 18:35:31 +02:00
Nathan Jones
8fc48b4f99 Fix serve on Windows without win32* modules. 2007-06-26 10:48:58 -04:00
Thomas Arendsen Hein
5b3cfe2be9 Fix and test 'hg backout' without or with too many revisions. 2007-06-26 15:28:17 +02:00
Jean-Francois PIERONNE
7a71f63f2b OpenVMS patches 2007-06-08 16:24:43 +02:00
Matt Mackall
469dca271e backout: report short hash in commit message 2007-06-25 12:44:48 -05:00
Thomas Arendsen Hein
61d51838df New config option: ui.report_untrusted (defaults to True) 2007-06-25 22:41:15 +02:00
Thomas Arendsen Hein
05fbf9e284 Make earlygetopt return a list of all option values, use the last value. 
This fixes:
"hg -R" showing a useful error instead of traceback
"hg -R foo --repository bar" using bar instead of foo

And provides a way for other users of earlygetopt to accept more than
one value.
 2007-06-25 22:08:10 +02:00
Benoit Boissinot
4fdb840ede Make changeset_printer respect ui diffopts 2007-06-25 11:29:17 -07:00
Markus F.X.J. Oberhumer
974b7c5201 Add option "hidden" to hgwebdir. 
TODO: should this option be renamed to 'hide_from_index' or
maybe to 'index_ignore' (like Apache's mod_autoindex) ?
 2007-06-25 14:46:20 +02:00
Markus F.X.J. Oberhumer
84ffe403b9 Add support for RFC2822 to util.parsedate(). 2007-06-25 14:46:20 +02:00
Matt Mackall
9a11c35355 strip: move strip code to a new repair module 2007-06-25 01:26:44 -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
Matt Mackall
9f3b2a8b06 cat: return an error on failure 2007-06-24 09:47:54 -05: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
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
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
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
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
3019bb7a0b Kill trailing spaces 2007-06-21 09:25:49 +02: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
Brendan Cully
f7e826dad3 Fix dispatch error message when not in a repo 2007-06-20 20:13:31 -07:00
csaba.henk@creo.hu
e069b7ea12 timestamp of gzip archives taken from changeset context 2007-06-11 19:09:01 +02:00
TK Soh
abffe2b1c3 tag: abort when trying to remove nonexistent tags 2007-06-15 14:48:21 -05:00
Brendan Cully
95c08c2bfc Small fixes for 3acdabb0ef1d (hg heads branch) 2007-06-20 17:53:11 -07:00
Eric Hopper
0bcc9fc15c Add option to heads to show only heads for current branch. 2007-06-19 08:37:43 -07:00
Eric Hopper
bdc1293e28 Provide a version independent way to use the set datatype. 2007-06-19 08:37:41 -07:00
Patrick Mezard
9a43b6739b Fix read mode when importing patch. 2007-06-19 17:03:31 +02:00
Patrick Mezard
8f4c2f4b77 patch: fix ui.patch regression introduced by ef94caf261ce. 
The idea is ui.patch is either empty or wisely filled by user.
 2007-06-19 17:02:07 +02:00
Patrick Mezard
0b90ff3d83 Merge with crew-stable 2007-06-20 00:22:51 +02:00
Patrick Mezard
aae84719a5 Fix issue 589: "undelete" sequence leads to crash. 2007-06-20 00:10:21 +02:00
Patrick Mezard
ded8d8999d Fix debugrename --rev option 2007-06-20 00:09:30 +02:00
Thomas Arendsen Hein
4d29c6dc8e Updated copyright notices and add "and others" to "hg version" 2007-06-19 08:51:34 +02:00
Thomas Arendsen Hein
483231d996 Cleanup of whitespace, indentation and line continuation. 2007-06-19 08:06:37 +02:00
Matt Mackall
30a1419154 dispatch: report failed imports nicely 2007-06-18 21:30:27 -05:00
Matt Mackall
ab72eb680f demandimport: fix issue579 and add a test 
fix suggested by Brendan
 2007-06-18 19:43:26 -05:00
Matt Mackall
c61bc27ccc dispatch: add generic pre- and post-command hooks 2007-06-18 17:49:56 -05:00
Lee Cantey
c2221237be Merge with crew 2007-06-18 15:06:14 -07:00
Lee Cantey
416c20c0e1 Fix for demandimport.py and Windows compiled version. 
From Shun-ichi Goto in BTS issue 457 http://www.selenic.com/mercurial/bts/msg2780
 2007-06-18 15:03:55 -07:00
Brendan Cully
4a2d1da1c5 Work around heisenbug in Popen3.__del__ 2007-06-18 14:52:31 -07:00
Brendan Cully
a4f4ecdc68 Merge with mpm 2007-06-18 12:39:43 -07:00
Brendan Cully
b969d388db Make fast-forward merges full merges 2007-06-18 12:38:54 -07:00
Matt Mackall
c5b84a3392 hooks: separate hook code into a separate module 2007-06-18 13:24:34 -05:00
Matt Mackall
5ecb0cb232 dispatch: fix handling of incorrect number of arguments 2007-06-18 13:24:34 -05:00
Matt Mackall
b99ae11550 dirstate: pull ignore smarts out of ui 2007-06-18 13:24:34 -05:00
Matt Mackall
579d9e3b44 encoding: pull fallbackencoding out of localrepo into early parsing 2007-06-18 13:24:34 -05:00
Matt Mackall
cdeb6ec2da extensions: kill ui readhooks 
Move .hgrc extension loading into localrepo
 2007-06-18 13:24:34 -05:00
Matt Mackall
8395ca26f3 extensions: pull extension-aware bits out of ui 2007-06-18 13:24:34 -05:00
Matt Mackall
2033c5f43d dirstate: refactor checkinterfering 2007-06-18 13:24:34 -05:00
Matt Mackall
be01255569 dirstate: hide some more internals 2007-06-18 13:24:34 -05:00
Matt Mackall
c71a2b10a7 dirstate: hide internal vars 
Add an __iter__ method so commands don't need to poke at _map.
 2007-06-18 13:24:34 -05:00