Alexis S. L. Carvalho
208d8d38e9
setup.py: reload __version__.py after writing it.
...
write_version loads __version__.py before writing it (see a48d939230f4),
so we have to explicitly reload it to use the correct version.
Problem diagnosed by Christian Ebert.
2007-02-06 15:55:20 -02:00
Alexis S. L. Carvalho
5357b68523
fix strip'ping the second parent of a merge
2007-02-06 15:54:58 -02:00
Alexis S. L. Carvalho
60b9229aaa
install reposetup hook right after loading the extension
2007-02-06 15:43:01 -02:00
Alexis S. L. Carvalho
b2dff97617
Open bundle files in binary mode
2007-01-30 20:37:58 -02:00
Alexis S. L. Carvalho
9248b0bde4
filecommit: don't forget the local parent on a merge with a local rename
2007-01-30 19:09:08 -02:00
Alexis S. L. Carvalho
93c60f1213
Fallback to ascii if getpreferredencoding raises an exception
...
Fixes issue478.
2007-01-30 18:32:23 -02:00
Alexis S. L. Carvalho
a8f8cca050
unbundle: don't use urllib if it's a local file
2007-01-30 18:32:21 -02:00
Alexis S. L. Carvalho
5b836109d8
docopy: deal with globs on windows in a better way
2007-01-30 18:32:20 -02:00
Alexis S. L. Carvalho
29a5332aa9
Explicitly expand globs on Windows
2007-01-30 18:32:18 -02:00
Benoit Boissinot
20cb213c14
mtime can be -1 after a merge and cause tracebacks on win32.
...
Output "unset" instead.
2007-01-30 00:26:19 +01:00
Thomas Arendsen Hein
661a8e64e4
Adjust documentation for 506f21c68c1d (empty username to force specifying it)
2007-01-25 17:57:51 +01:00
Thomas Arendsen Hein
1be2af280f
Abort on empty username so specifying a username can be forced.
...
This behaviour was introduced by d5601ef79d86 and broken by c608116532fe.
Added test for this.
2007-01-24 23:04:51 +01:00
Patrick Mezard
f73963b537
Copied files sources were not shown by status -C under Win32.
...
repo.dirstate.copied() takes a normalized paths while local paths were passed.
2007-01-14 19:10:35 +01:00
Alexis S. L. Carvalho
83a6730e68
add test for 8d53ef723a6c
2007-01-15 16:13:50 -02:00
Benoit Boissinot
a033481246
bundlerepo: it was meant to be revdiff() instead of chunk()
2007-01-15 17:56:20 +01:00
Christian Ebert
f1ac1bb856
patchbomb: fix timezone offset in message date header
...
Use mercurial.util instead of time to set and format dates.
2007-01-13 02:15:49 +01:00
Benoit Boissinot
7616bbdf28
fix for digest auth when using keepalive.py
...
The problem was with python > 2.3 which stores part of the
headers in unredirected_hdrs.
Furthermore, we simplify the code to use httplib directly.
fix issue473
2007-01-08 16:18:29 +01:00
Benoit Boissinot
a76c975e9d
Subclass file with a __len__ method instead of setting Content-length
...
This is necessary for the next patch to work with python2.3
Refactor the subclassing of send()
2007-01-08 16:12:35 +01:00
Thomas Arendsen Hein
742fac2ea2
Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback
2007-01-02 22:12:38 +01:00
Benoit Boissinot
9b95329263
various doc fixes
...
- update can no longer be used to merge
- short summary start with lowercase
- add merge to short help list
- fix tests
2006-12-29 06:37:43 +01:00
Benoit Boissinot
e12e825086
catch socket.error
...
fix issue394
2006-12-29 06:08:46 +01:00
Benoit Boissinot
0a972b6964
fix handling of multiple Content-type headers
...
This can happen if an error happens while sending
application/mercurial-0.1 content. The error page will
be sent resulting (for at least lighttpd) in the following
headers:
Content-type: application/mercurial-0.1
Content-type: text/html
which result in req.proto = 'application/mercurial-0.1, text/html'
fix issue344
2006-12-29 05:27:48 +01:00
Benoit Boissinot
9fe271946b
add [diff] section to hgrc documentation
2006-12-29 04:22:31 +01:00
Benoit Boissinot
8e594b6a32
inst.reason isn't alway in the form (errno, strerror)
...
urllib2.urlopen("foobar://foo") is an example
where inst.reason is a string
fix issue383
2006-12-28 01:14:12 +01:00
Benoit Boissinot
4247929c84
fix hg help <ext> for extension that do not define any command
...
solve issue462
2006-12-26 21:59:01 +01:00
Benoit Boissinot
ac64b63257
mq: fix strip failing to unlink a bundle
...
os.unlink doesn't know how to deal with urls
2006-12-26 21:57:20 +01:00
Thomas Arendsen Hein
7701e96286
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
2006-12-26 14:17:48 +01:00
Benoit Boissinot
184e223932
test-manifest-merging: we only need to remove files
2006-12-24 22:28:01 +01:00
Brendan Cully
15d31f9f1f
Make test-manifest-merging less likely to delete the whole filesystem
2006-12-22 16:29:35 -08:00
Edouard Gomez
67504f12fd
Send encoding information in rss header
2006-12-21 20:41:56 +01:00
Matt Mackall
4492623506
Fix a pygettext complaint
2006-12-14 17:32:25 -06:00
Benoit Boissinot
c525e25a47
spelling fix
2006-12-14 00:41:11 +01:00
Thomas Arendsen Hein
bdd9bc9c2e
sample.hgrc: hgk extension is now in hgext. Use churn as example for contrib.
2006-12-19 15:46:02 +01:00
Thomas Arendsen Hein
6cdaa1eb33
purge extension doesn't need "#!/usr/bin/env python".
...
(from the Debian package: deb_specific__hgpurge.py.patch)
2006-12-19 15:37:10 +01:00
Matt Mackall
798c91c02c
Added signature for changeset b73092605dd7aba2a9c57c9a4c9f4f5d650a3166
2006-12-17 19:17:18 -06:00
Benoit Boissinot
fc997dfbf2
fix calculation of new heads added during push with -r
...
fix issue450
2006-12-17 05:00:22 +01:00
Thomas Arendsen Hein
c72030a3d2
Adjust test-help output for the change in 28dd65def6cd.
2006-12-16 23:33:24 +01:00
Thomas Arendsen Hein
1d64670235
Fix test-hup for different output of ls on at least MacOS X and Solaris 8.
2006-12-16 23:24:30 +01:00
Alexis S. L. Carvalho
437bbbf008
convert-repo: update usage information
2006-12-16 20:18:36 -02:00
Thomas Arendsen Hein
6857107023
Make 'hg sign' behave like other commands: Default to current parent.
2006-12-16 23:11:16 +01:00
Thomas Arendsen Hein
c0034c572a
doc fix: hg tags defaults to current parent revision, too.
...
Additionally use better language for the help text for tag,
cat and manifest.
2006-12-16 22:58:10 +01:00
Thomas Arendsen Hein
fb1cbb4570
doc string fix: hg cat and manifest default to current parent revision.
2006-12-16 22:33:39 +01:00
Thomas Arendsen Hein
66709dc5f7
Using --date "" isn't possible, so don't document epoch. (see issue447)
2006-12-16 22:13:56 +01:00
Matt Mackall
5b91081b08
convert-repo: avoid adding bogus value to shamap on tag update
2006-12-16 14:41:34 -06:00
Matt Mackall
013499cdd5
convert-repo: fix recoding of committer
2006-12-16 14:35:14 -06:00
Thomas Arendsen Hein
ef969c8db0
Include hg.1.gendoc.txt in doc/MANIFEST to prevent unnecessary rebuild.
2006-12-16 13:57:37 +01:00
Thomas Arendsen Hein
9a5ca784b6
Regenerate hg.1 manpage if help text in help.py changes.
2006-12-16 13:54:23 +01:00
Alexis S. L. Carvalho
88251bd81b
util.system: fix quoting on windows
2006-12-16 02:38:18 -02:00
Alexis S. L. Carvalho
2726e242c0
templater.py: fix obfuscate
2006-12-16 02:21:46 -02:00
Benoit Boissinot
877ef87ad8
fix strip on windows
...
c: was interpreted as a protocol, prepend file: to the bundle file name
2006-12-15 23:19:12 +01:00