Skip to content
Snippets Groups Projects
  1. Apr 20, 2018
  2. Apr 19, 2018
  3. Apr 20, 2018
  4. Apr 19, 2018
  5. Apr 18, 2018
  6. Apr 19, 2018
    • Matt Harbison's avatar
      infinitepush: open files in binary mode · 33d26f7bd6ca
      Matt Harbison authored
      This fixes the scary looking abort in test-infinitepush-ci.t when unbundling:
      
        --- tests/test-infinitepush-ci.t
        +++ tests/test-infinitepush-ci.t.err
        @@ -84,15 +84,12 @@
      
           $ hg unbundle .hg/scratchbranches/filebundlestore/a4/c2/a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
           adding changesets
        -  adding manifests
        -  adding file changes
        -  added 1 changesets with 1 changes to 1 files
        -  new changesets 6cb0989601f1
        -  (run 'hg update' to get a working copy)
        -
        -  $ hg glog
        -  o  1:6cb0989601f1 added a
        -  |  public
        +  transaction abort!
        +  rollback completed
        +  abort: stream ended unexpectedly  (got 68 bytes, expected 218759168)
        +  [255]
        +
        +  $ hg glog
           @  0:67145f466344 initialcommit
              public
      
      This was found by grepping for '"r', "'r", '"w' and "'w" after manually creating
      a bundle from the same revision, diffing against the corrupt one, and seeing CRs
      sprinkled around.  Sadly, the missing bookmarks are still a problem in the two
      remaining test failures.
      33d26f7bd6ca
  7. Mar 31, 2018
  8. Apr 18, 2018
  9. Mar 04, 2018
    • Augie Fackler's avatar
      rebase: introduce support for automatically rebasing orphan changes · 92213f6745ed
      Augie Fackler authored
      _destautorebase(SRC) is based on the _destrestack(SRC) revset from
      fbamend. The supporting _possibledestination function is extracted
      from evolve, with minor cleanups.
      
      We've considered some alternatives here:
       * This change, but with --auto as the flag name. We're hedging our bets
         on this a little in this change so that if this ends up being the wrong
         direction we haven't burned the valauble --auto name on rebase.
       * --destination auto: I've got reservations about the discoverability of this,
         and we don't currently have a good story for a revset alias of sorts that
         changes behavior depending on the context in which it's used.
       * A "rebase presets" feature, where we could use the currently-an-error
         positional argument space for the rebase command to define presets, so that
         users could define a 'linearize' preset that specifies
         --revision='orphan()-obsolete()' and --dest=_destautoorphanrebase(SRC).
      
      Personally, I find the third option somewhat appealing, but am
      hesitant to "spend" the functionality space of positional arguments to
      the rebase command. We should revisit the way we expose this
      functionality sometime in the 4.7 cycle once we've had a chance to vet
      the implementation of the functionality.
      
      Differential Revision: https://phab.mercurial-scm.org/D2668
      92213f6745ed
  10. Apr 18, 2018
  11. Apr 17, 2018
  12. Apr 18, 2018
  13. Apr 17, 2018
  14. Apr 13, 2018
    • Yuya Nishihara's avatar
      log: fix crash on empty revision with --copies switch · 141017c7f7a9
      Yuya Nishihara authored
      If a revset is empty, .max() raises ValueError.
      
      I don't see any reason to recompute the revs, so I made it reuse the one
      returned by logcmdutil.getrevs(). If no revs specified by command line,
      the endrev will be smartset.spanset(repo) + 1, which is basically the same
      as len(repo), the default of getrenamedfn(). If --follow specified,
      revs.max() points to the working parent, which seems more correct.
      141017c7f7a9
  15. Apr 17, 2018
    • Yuya Nishihara's avatar
      revsetlang: do not pass in non-bytes to parse() · 03d7f885d5f2
      Yuya Nishihara authored
      Since parse() isn't a simple function, we shouldn't expect it would raise
      TypeError or ValueError for invalid inputs. Before, TypeError was raised
      at 'if pos != len(spec)', which was quite late to report an error.
      
      This patch also makes tokenize() detect invalid object before converting
      it to a py3-safe bytes.
      
      Spotted while adding the 'revset(...)' hack to _parsewith().
      03d7f885d5f2
  16. Apr 13, 2018
  17. Apr 17, 2018
  18. Apr 06, 2018
Loading