Bryan O'Sullivan
2c95b6aab9
Merge with crew
2008-02-06 20:00:35 -08:00
Bryan O'Sullivan
4a012ef2b9
Merge with crew
2008-02-06 19:57:52 -08:00
Thomas Arendsen Hein
1c6bad32e4
Update help output of test-convert for GNU arch entry.
2008-02-07 00:41:30 +01:00
Patrick Mezard
bf4d100b3a
Merge with crew-stable
2008-02-06 23:24:15 +01:00
Patrick Mezard
83e45fd5f7
mq: qimport must read patches in binary mode
2008-02-06 23:09:13 +01:00
Aleix Conchillo Flaque
718a1ad73e
convert: add full description for gnu arch revisions
2008-02-06 11:42:04 +01:00
Thomas Arendsen Hein
28a046f2fa
merge with main
2008-02-06 09:11:36 +01:00
Matt Mackall
d3e9e34b5b
keyword: fix my string pasting thinko
...
Spotted by Maxim Dounin
2008-02-05 16:09:21 -06:00
Dirkjan Ochtman
c185787ac3
cleanly abort on unknown archive type (issue966)
2008-02-05 15:54:42 +01:00
Dirkjan Ochtman
8f3b12c02f
hgweb: fix search skipping tip
2008-02-05 14:02:03 +01:00
Aleix Conchillo Flaque
5eeb30050d
convert: added GNU Arch source converter
2008-02-05 09:30:08 +01:00
Thomas Arendsen Hein
347cc1cda8
merge with crew-stable
2008-02-05 15:59:10 +01:00
Thomas Arendsen Hein
1d27b34424
merge with crew-stable
2008-02-05 14:34:46 +01:00
Steve Borho
eda1ae23fa
filemerge: wrap quotes around tool path
2008-02-04 19:38:34 -06:00
Christian Ebert
9f2689b36a
keyword: nokwcommands, restricted string variables at top level
...
- prettier syntax conforming eg. to commands.norepo
- possibly easier to hook from outside
2008-02-04 21:08:45 +01:00
Christian Ebert
795a5f750c
keyword: split line continuation in 2 steps (style)
2008-02-04 18:27:36 +01:00
Christian Ebert
9a6e5dde8d
keyword: add empty_ok argument to kwrepo.commit
2008-02-04 18:27:36 +01:00
Christian Ebert
6bb66cc4a1
keyword: allow keyword expansion on clone
...
If [keyword] filename patterns are specified in a global hgrc
keywords will be expanded in clone.
This behaviour is more consistent but also more dangerous.
Specifying global, and thus more complicted, [keyword] patterns
might slow things down as well.
Mention this in help?
2008-02-04 18:27:36 +01:00
dhruva
3ad3c6c3ba
filemerge: fix pattern matching
2008-02-04 09:56:01 -06:00
Lee Cantey
abeb7dc0ee
filemerge: fix path to working file when fixeol is enabled
2008-02-03 23:58:02 -08:00
Matt Mackall
0e0a073578
mergetools: correct vim typo
2008-02-04 09:53:10 -06:00
Matt Mackall
5d1d504393
filemerge: handle missing regappend
2008-02-04 09:51:56 -06:00
Lee Cantey
2810a05ef6
util_win32: add missing valname param to query_val function
2008-02-03 23:08:16 -08:00
Steve Borho
351fbe22a2
filemerge: two fixes for kdiff3 example configuration
2008-02-03 22:27:53 -06:00
Alexis S. L. Carvalho
e61b27b1b7
update the branch cache at the end of addchangegroup
...
This should avoid a bad performance problem when the branch cache is
not up-to-date, and hgweb can't write an updated version because it
lacks permissions.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
e5aba58605
qpop/qrefresh: update self.applied before calling strip
...
This will be important for the next patch, which may end up using this
variable during an addchangegroup caused by strip.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
68bddaa728
hg import: write the dirstate after every commit
...
This allows the transaction system to backup the correct file, so
that a future rollback can do the right thing.
This should fix issue963.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
667f990846
localrepo._tag: add a seek before writing the new tag
...
Some systems require a seek (or flush) between read and write
operations on the same file object.
This should fix issue838.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
99a2d5f75c
convert: use 'unknown' and '0 0' if commit author or date weren't specified
...
Closes issue873.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
f636dc58cf
httprepo: use separate handlers for HTTP and HTTPS
...
This is needed to keep the code in keepalive.py from sharing
the same connection between HTTP and HTTPS.
cd1a6ad30c82 explains why we were using a single handler.
This should fix issue892.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
67c49a0cf5
move __del__ from httprepository to basehttphandler
...
This should prevent the next patch from reopening an issue fixed by
b7ccb4b856de.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
56322c7a24
mq: don't allow patches with some reserved names
...
The current list of reserved names includes only mq control files.
Also, reserve names starting with ".hg" (to avoid troubles with
e.g. .hgignore and .hgtags), and with ".mq" (to allow future
extensions).
This should fix issue841.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
9dbbca9b5c
mq: pop/refresh: avoid losing revisions not managed by mq
...
We already disallow committing on top of an mq revision exactly
to avoid losing this new revision during a qpop/qrefresh, so this
can be seen as an additional safety check.
If this is not enough to fix issue844, it should at least prevent
it from happening.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
d4fc1890f0
mqrepo: don't abort if the status file has an unknown node
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
65d93076b9
sshrepo: be more careful while reading data
...
This should avoid some tracebacks when the server sends some garbage.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
05d18f9b8d
fix markup of templates/{,old/}header.tmpl
2008-02-03 21:03:46 -02:00
Steve Borho
434a24dd1b
add merge sections to hgrc.5
2008-01-31 22:32:11 -06:00
Matt Mackall
a2dcecb2de
filemerge: remove the hgmerge script
...
This is now better handled using [merge-tools] and [merge-patterns] in hgrc.
2008-02-03 19:29:05 -06:00
Matt Mackall
176caad743
filemerge: add an example set of global settings for common merge tools
2008-02-03 19:29:05 -06:00
Matt Mackall
ad1e6058b9
filemerge: add config item for GUI tools
...
<tool>.gui indicates whether a tool requires a GUI to run
2008-02-03 19:29:05 -06:00
Matt Mackall
2c7d69802c
merge: add registry look up bits to tool search
2008-02-03 19:29:05 -06:00
Matt Mackall
6b42261cb8
merge: add support for tool EOL fixups
...
specified with merge-tools:<tool>.fixeol=True
2008-02-03 19:29:05 -06:00
Matt Mackall
9d996cd13f
merge: allow smarter tool configuration
...
Add [merge-tool] hgrc section with:
<tool>.executable = name or path (<tool>)
<tool>.args = args with $local/base/other/output ($local $base $other)
<tool>.priority = priority (default 0)
<tool>.binary = handles binary (False)
<tool>.symlink = handles symlinks (False)
<tool>.checkconflict = check for conflict markers (False)
<tool>.premerge = try internal simplemerge (True if not binary or symlink)
Four built-in tools: internal:{merge,local,other,fail}
Add [merge-patterns] section of the form:
<pattern> = <tool>
Priority of settings is:
HGMERGE
merge-patterns
ui:merge
merge-tools by priority
hgmerge, if it can be found
Changes:
unsuccessful merges leave .orig files
2008-02-03 19:29:05 -06:00
Matt Mackall
22c4273b99
filemerge: pull file-merging code into its own module
2008-02-03 19:29:05 -06:00
Matt Mackall
346758f77c
merge: move the bulk of simplemerge into core
...
- keep existing simplemerge command in contrib
- clean up test interface
2008-02-03 19:29:05 -06:00
Alexis S. L. Carvalho
961a45df72
merge with crew-stable
2008-02-03 21:47:07 -02:00
Thomas Arendsen Hein
da87e7b4ae
test-serve: wait before killing to always hide the "killed!" message.
...
Without the sleeps slower systems never display never display "killed!"
while faster systems sometimes or nearly always display it.
2008-02-02 21:01:43 +01:00
Thomas Arendsen Hein
31213f9684
Mention 'hg update' to switch branches in help for branch and branches.
2008-02-02 14:55:14 +01:00
Thomas Arendsen Hein
73a0d43985
Clarify help for hg status and make it consistent.
2008-02-02 14:49:31 +01:00
Bryan O'Sullivan
b945cf7339
profile: expand PID in output file name
2008-02-01 13:31:46 -08:00
