Commit Graph

7273 Commits

Author SHA1 Message Date
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
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
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
Martin Geisler
7564668184 commit: improve --date help text 2011-04-26 12:55:26 +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
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 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
Idan Kamara
44990ce111 identify/help: say what the command does first, mention bookmarks 2011-04-19 00:41:47 +03: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
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
Martin Geisler
42b381babb help/hgweb: add pointer to hgrc(5) location 2011-04-01 12:18:37 +02:00
Martin Geisler
9e82c0f40f patchbomb, help/hgweb: do not refer to config files as hgrc files 2011-04-01 12:14:42 +02:00
Yuya Nishihara
95ce899cb1 hgweb: add bookmark labels to monoblue theme (based on 4d7cfa1867b5) 2011-03-30 02:22:15 +09:00
Matt Mackall
c989b5dd89 merge: avoid unlinking destination of merge when case changes (issue2715) 2011-03-22 12:00:38 -05:00
Matt Mackall
c6bc26dacb dirstate: introduce a public case normalizing method 2011-03-22 11:59:43 -05:00
Miloš Hadžić
b3d3d7aa76 push/outgoing: print remote target path even if there's an error (issue2561)
This is a simple patch to make hg push/hg outgoing print their remote target
path even if the operation fails. I'm not sure if the original behavior was by
design.

This patch also changes one test to reflect the changed behaviour.
2011-03-17 22:55:02 +01:00
Eric Eisner
3cc72a297f subrepo: recognize scp-style paths as git URLs 2011-03-17 16:29:09 -04:00
Alexander Solovyov
517dbf068d graphmod: use revsets internally
Thanks for the idea and most of the implementation to Klaus Koch

Backs revisions() and filerevs() with DAG walker which can iterate through
arbitrary list of revisions instead of strict one by one iteration from start to
stop. When a gap occurs in a revisions (i.e. in file log), the next topological
parent within the revset is searched and the connection to it is printed in the
ascii graph.

File graph can draw sometimes more connections than previous version, because
graph is produced according to the revset, not according to a file's filelog.

In case the graph contains several branches where the left parent is null, the
graphs for each are printed sequentially, not in parallel as it was a case
earlier (see for example the graph for README in hg-dev).
2011-03-13 15:53:38 +01:00
Augie Fackler
a2ae5598b9 svn subrepo: attempt work around obstructed checkouts (issue2752)
It should be possible to do better than this with 'svn switch', but
the logic required woud be significantly more complex. Until someone
needs the performance improvements of using switch, we'll just use the
same strategy for everything.
2011-04-29 03:34:18 -05:00
Idan Kamara
903182ef3d bookmarks: further restrict IOError on write
This won't risk losing the undo file when the error
was something other than file not found
2011-04-29 18:43:36 +03:00
Idan Kamara
bde7afbe82 tags: loosen IOError filtering when reading localtags 2011-04-29 18:44:56 +03:00
Adrian Buehlmann
7dd20c29b9 changegroup: do not count closed new heads (issue2697)
If a closed head gets pulled, we currently see (example):

  $ hg pull
  pulling from $TESTTMP/repo2
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 2 changesets with 1 changes to 1 files (+1 heads)
  (run 'hg heads' to see heads, 'hg merge' to merge)

A subsequent 'hg heads' doesn't show that head because it is closed.

This patch improves the UI response texts for that same use case to:

  $ hg pull
  pulling from $TESTTMP/repo2
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 2 changesets with 1 changes to 1 files
  (run 'hg update' to get a working copy)

That is, the part "(+1 heads)" is not shown in that case any longer.
2011-04-24 20:11:05 +02:00
Benoit Boissinot
ce0250b974 bookmarks: be more restrictive in our Exception catching 2011-03-13 15:02:49 +01:00
Matt Mackall
52b51e7342 tags: catch more corruption during cache parsing (issue2779) 2011-04-26 10:51:19 -05:00
Patrick Mezard
be05d24d8e patch: remove redundant variable in iterhunks() 2011-04-26 21:22:14 +02:00
Martin Geisler
539e56249b merge with stable 2011-04-26 13:13:35 +02:00
Greg Ward
36bf37fc8a atomictempfile: rewrite docstring to clarify rename() vs. close(). 2011-04-24 17:30:50 -04:00
Greg Ward
d95f0484f4 atomictempfile: avoid infinite recursion in __del__().
The problem is that a programmer using atomictempfile directly can
make an innocent everyday mistake -- not enough args to the
constructor -- which escalates badly.  You would expect a simple
TypeError crash in that case, but you actually get an infinite
recursion that is surprisingly difficult to kill: it happens between
__del__() and __getattr__(), and Python does not handle infinite
recursion from __del__() well.

The fix is to not implement __getattr__(), but instead assign instance
attributes for the methods we wish to delegate to the builtin file
type: write() and fileno(). I've audited mercurial.* and hgext.* and
found no users of atomictempfile using methods other than write() and
rename(). I audited third-party extensions and found one (snap)
passing an atomictempfile to util.fstat(), so I also threw in
fileno().

The last time I submitted a similar patch, Matt proposed that we make
atomictempfile a subclass of file instead of wrapping it. Rejected on
grounds of unnecessary complexity: for one thing, it would make the
Windows implementation of posixfile quite a bit more complex. It would
have to become a subclass of file rather than a simple function -- but
since it's written in C, this is non-obvious and non-trivial.
Furthermore, there's nothing wrong with wrapping objects and
delegating methods: it's a well-established pattern that works just
fine in many cases. Subclassing is not the answer to all of life's
problems.
2011-04-24 19:25:10 -04:00
Idan Kamara
762d333ae9 eliminate various naked except clauses 2011-04-23 00:51:25 +03:00
Adrian Buehlmann
a928db8b4e move system_rcpath and user_rcpath to scmutil 2011-04-21 21:16:54 +02:00
Adrian Buehlmann
bee8559898 move os_rcpath from util to scmutil 2011-04-21 20:54:45 +02:00