Martin Geisler
a5dc911698
merge with mpm
2011-04-30 15:30:51 +02:00
Martin Geisler
e57b3a9f70
hgweb: initialize permhooks at definition time
...
This is simpler than creating it empty and then appending the default
checkauthz hook 50 lines below.
2011-04-30 13:47:22 +02:00
Brodie Rao
9c3a456083
revset: fix undefined name ParseError
2011-04-30 06:58:22 -07:00
Dan Villiom Podlaski Christiansen
a70a975a50
branchcache: improve speed relative to the amount of heads
...
Updating the branch cache is quadratic to the amount of heads in the
repository. One consequence of this was that cloning a pathological
repository with 10,000 heads (and nothing else) took hours of CPU
time.
This patch makes one of the inner loop much faster, by removing a
changectx instantiation, and removes another entirely in cases where
there are no candidate branch heads which descend from other branch
heads.
2011-04-30 12:56:28 +02:00
Alexander Solovyov
23228e2ea0
drop {short,hex}(ctx.node()) calls in favor of ctx methods
2011-04-30 12:55:07 +02:00
Idan Kamara
6862ebb98f
mq: be more explicit on invalid patch name message
2011-04-29 22:21:13 +03:00
Benoit Boissinot
a266b51663
fix broken tests
...
test-debugcomplete.t broken by 7f2d537fe9fa
test-highlight.t broken by 064b658181dd
2011-04-30 11:16:52 +02:00
Matt Mackall
3b61150db3
merge with stable
2011-04-30 03:44:31 -05:00
Matt Mackall
463d91c511
subrepo: backout 11184e56ccc1
2011-04-30 03:00:38 -05:00
Idan Kamara
856702f469
mq: add '.' and '..' to list of forbidden patch names
...
When an empty string is being passed to normname
it would return '.' causing checkfile() to always
return that a patch with that name exists.
2011-04-29 22:21:13 +03:00
Peter Arrenbrecht
9855dca4f8
wireproto: add test for new optional arg missing on server
...
New argument is silently ignored by both HTTP and SSH servers.
This means we can, for instance, add new flags to getbundle()
to request advanced features (like lightweight-copy-aware bundles),
and older servers will silently ignore this request and send back
a plain bundle.
2011-04-29 14:54:01 +02:00
Matt Mackall
f184c5b13d
merge with stable
2011-04-30 02:42:05 -05:00
Augie Fackler
a74cb339b1
subrepo: tell Subversion when we are non-interactive (issue2759)
...
$ hg clone repo repo-clone -v
updating to branch default
resolving manifests
getting .hgsub
getting .hgsubstate
abort: svn: OPTIONS of 'https://subversion.srv/project ': Server certificate
verification failed: issuer is not trusted (https://subversion.srv )
2011-04-29 03:05:48 -05:00
Thomas Arendsen Hein
f0eec1822c
tests: check for (*/sec) instead of (*B/sec) to match (X bytes/sec)
...
I just had: transferred 606 bytes in 2.9 seconds (211 bytes/sec)
2011-04-29 11:04:39 +02:00
Patrick Mezard
2cbeb4b9c6
extdiff: fix broken symlinks handling (issue1909)
2011-04-29 08:04:46 +02:00
Benoit Allard
1f65749729
web: Made elapsed time calculation dynamic (javascript).
...
This allow safe caching of the pages by the browser and still display the right
amount of elapsed time upon page refresh.
If javascript is disabled, absolute time is displayed, leaving it readable.
All the templates have been updated.
2011-04-28 17:02:39 +02:00
Steven Stallion
b6327cdf0a
extdiff: add repository root as a variable
...
Some external diff tools (notably Plan 9 diff(1)) require the absolute path
to the file being diffed for proper function. A root variable was added to
inform an external tool of the repository root (the tool is invoked with the
cwd set to tmproot).
2011-04-27 21:55:46 -04:00
Martin Geisler
7564668184
commit: improve --date help text
2011-04-26 12:55:26 +02:00
Patrick Mezard
7b07c85acf
test-transplant: fix missing file addition
2011-04-25 21:11:28 +02:00
Matt Mackall
0739231ee2
merge with i18n
2011-04-21 15:10:59 -05:00
Patrick Mezard
95e7147cd4
convert: make filemap prune useless branch closing revs (issue2774)
...
A branch closing revision only applies if one of its parents belongs to the
branch being closed. Otherwise the filemap can prune it too.
2011-04-20 23:15:18 +02:00
Kevin Bullock
4669edf97c
identify: further clarification of help
...
Following on to 9010cb9bd620, correct a minor grammar issue, re-wrap to
72 columns, and further clarify wording.
2011-04-19 13:33:43 -05:00
Wagner Bruna
2b383e0d00
i18n-pt_BR: synchronized with 9010cb9bd620
2011-04-19 12:00:22 -03:00
Martin Geisler
6cd55d2029
hgweb: detect change based on changelog size too
...
Before, there was a race between an access and a modification made
within the same second.
2011-04-19 15:15:56 +02:00
Martin Geisler
f225a4e198
rollback: lower-case warning issued when branch cannot be reset
...
Also improved the word order.
2011-04-19 13:25:19 +02:00
Martin Krüger
224af593e0
i18n-de: improve grammar
2011-04-19 09:30:42 +02:00
Idan Kamara
44990ce111
identify/help: say what the command does first, mention bookmarks
2011-04-19 00:41:47 +03:00
Martin Geisler
cb82832656
help config: explain that config files do not exist by default
...
Inspired by critique given on StackOverflow where a user writes:
I can have a good guess at what "%USERPROFILE%" might signify but
none of the files listed in the "hg help config" output exist after
running the installer. Previous experience would suggest that
missing files mean something somewhere has gone seriously wrong.
http://stackoverflow.com/questions/2329023/2351139#2351139
2011-04-18 13:57:22 +02:00
Yun Lee
c6804b1629
help: move hgignore man page into built-in help (issue2769)
2011-04-17 23:08:35 +08:00
Alexander Solovyov
f4250e8e9c
graphlog: make use of graphmod's revset support
2011-04-23 15:04:15 +02:00
Matt Mackall
1cf3cf83b1
encoding: avoid localstr when a string can be encoded losslessly (issue2763)
...
localstr's hash method exists to prevent bogus matching on lossy local
encodings. For instance, we don't want 'caf?' to match 'café' in an
ASCII locale.
But when café can be losslessly encoded in the local charset, we can
simply use a normal string and avoid the hashing trick.
This avoids using localstr's hash method, which would prevent a match between
2011-04-15 23:45:41 -05:00
Idan Kamara
32b141c5c5
help/revset: fix grammar
2011-04-15 16:35:32 +03:00
Thomas Arendsen Hein
e97f821988
subrepo: prevent url normalization from removing // in ssh paths (issue2556)
2011-04-07 12:33:47 +02:00
Md. O. Shayan
43492ff710
hgweb: fix inconsistant display of graphlog (issue1706)
2011-04-07 13:23:07 +05:30
Martin Geisler
bcd0e81ccd
hgrc.5: drop 'hgext.' prefix when talking about extensions
...
The first paragraph apply to all extensions, not just those in hgext.
The second paragraph can just use the simpler form to load mq.
2011-04-07 11:17:55 +02:00
Matt Mackall
ada95b57d4
merge with crew
2011-04-06 15:13:49 -05:00
Matt Mackall
bfe6a35a69
url: use a regex to hide unsupported ssh passwords (issue2754)
2011-04-06 15:10:47 -05:00
Martin Geisler
f484933f96
help/dates: rephrase explanation of internal format
...
The old explanation referred to the two numbers as "unixtime" and
"offset" without really defining those terms.
2011-04-05 10:04:19 +02:00
Yuya Nishihara
8138520db0
hgweb: add missing bookmarks definition to coal/map
...
It shares most templates with paper style.
2011-04-03 23:47:17 +09:00
Yuya Nishihara
63284146ac
hgweb: add separate bookmarks listing to gitweb theme (based on 77ea38e46cc8)
2011-04-03 23:47:05 +09:00
Yuya Nishihara
ac9ff11417
hgweb: add bookmark labels to gitweb theme (based on 4d7cfa1867b5)
2011-04-03 23:44:28 +09:00
Yuya Nishihara
eac83f8ea6
hgweb: format page_nav of gitweb/error.tmpl and add missing links
2011-04-03 23:42:05 +09:00
Yuya Nishihara
d0f552f812
hgweb: fix typo and inactive link in page_nav and page_header of gitweb's help
2011-04-03 22:53:20 +09:00
Yuya Nishihara
6da6d2fbdd
hgweb: add separate bookmarks listing to monoblue theme (based on 77ea38e46cc8)
2011-04-03 22:53:20 +09:00
Yuya Nishihara
0055d5983d
hgweb: fix typo in page-header of monoblue's help template
2011-04-03 22:53:19 +09:00
Yuya Nishihara
e94cb76b15
hgweb: add missing bookmarks templates to atom/rss styles
...
It's already referenced from paper style.
2011-04-03 22:53:19 +09:00
Matt Mackall
565ca3ae19
merge with i18n
2011-04-01 13:25:26 -05:00
Matt Mackall
02d5be3b33
Added signature for changeset e5c66e134318
2011-04-01 12:42:02 -05:00
Wagner Bruna
c4c41c0583
i18n-pt_BR: synchronized with fa1153023ab1
2011-04-01 14:35:04 -03:00
Matt Mackall
a4567ca2a9
merge with i18n
2011-04-01 11:45:07 -05:00
