Skip to content
Snippets Groups Projects
  1. Apr 30, 2011
  2. Apr 29, 2011
  3. Apr 30, 2011
  4. Apr 29, 2011
  5. Mar 04, 2011
    • Patrick Mezard's avatar
      subrepo: handle svn tracked/unknown directory collisions · 9e8a9d45945c
      Patrick Mezard authored
      This happens more often than expected. Say you have an svn subrepository with
      python code. Python would have generated unknown .pyc files. Now, you rebase
      this setup on a revision where a directory containing python code does not
      exist. Subversion is first asked to remove this directory when updating, but
      will not because it contains untracked items. Then it will have to bring back
      the directory after the merge but will fail because it now collides with an
      untracked directory.
      
      Using --force is not very elegant and only works with svn >= 1.5 but the only
      alternative I can think of is to write our own purge command for subversion.
      9e8a9d45945c
  6. Apr 30, 2011
  7. Apr 29, 2011
    • Peter Arrenbrecht's avatar
      wireproto: add test for new optional arg missing on server · 58e58406ed19
      Peter Arrenbrecht authored
      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.
      58e58406ed19
  8. Apr 30, 2011
  9. Apr 28, 2011
    • Benoit Allard's avatar
      web: Made elapsed time calculation dynamic (javascript). · b24e5a708fad
      Benoit Allard authored
      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.
      b24e5a708fad
    • Steven Stallion's avatar
      extdiff: add repository root as a variable · 1c38777f7b8a
      Steven Stallion authored
      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).
      1c38777f7b8a
  10. Apr 17, 2011
  11. Apr 23, 2011
  12. Mar 13, 2011
    • Alexander Solovyov's avatar
      graphmod: use revsets internally · 9966c95b8c4f
      Alexander Solovyov authored
      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).
      9966c95b8c4f
  13. Apr 29, 2011
  14. Apr 24, 2011
    • Adrian Buehlmann's avatar
      changegroup: do not count closed new heads (issue2697) · 90d997a812dc
      Adrian Buehlmann authored
      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.
      90d997a812dc
  15. Apr 29, 2011
Loading