Skip to content
Snippets Groups Projects
  1. Oct 02, 2013
  2. Oct 01, 2013
  3. Sep 30, 2013
    • Katsunori FUJIWARA's avatar
      rebase: catch RepoLookupError at restoring rebase state for summary · e7fa36d2
      Katsunori FUJIWARA authored
      Before this patch, "hg summary" may fail, when there is inconsistent
      rebase state: for example, the root of rebase destination revisions
      recorded in rebase state file is already stripped manually.
      
      Mercurial earlier than 2.7 allows users to do anything other than
      starting new rebase, even though current rebase is not finished or
      aborted yet. So, such inconsistent rebase states may be left and
      forgotten in repositories.
      
      This patch catches RepoLookupError at restoring rebase state for
      summary hook, and treat such state as "broken".
    • Katsunori FUJIWARA's avatar
      rebase: catch RepoLookupError at restoring rebase state for abort/continue · 577f4c56
      Katsunori FUJIWARA authored
      Before this patch, "rebase --abort"/"--continue" may fail, when rebase
      state is inconsistent: for example, the root of rebase destination
      revisions recorded in rebase state file is already stripped manually.
      
      Mercurial earlier than 2.7 allows users to do anything other than
      starting new rebase, even though current rebase is not finished or
      aborted yet. So, such inconsistent rebase states may be left and
      forgotten in repositories.
      
      This patch catches RepoLookupError at restoring rebase state for
      abort/continue, and treat such state as "broken".
      577f4c56
    • Katsunori FUJIWARA's avatar
      histedit: suggest "histedit --abort" for inconsistent histedit state · 45c30868
      Katsunori FUJIWARA authored
      Mercurial earlier than 2.7 allows users to do anything other than
      starting new histedit, even though current histedit is not finished or
      aborted yet. So, unfinished (and maybe inconsistent now) histedit
      states may be left and forgotten in repositories.
      
      Before this patch, histedit extension shows the message below, when it
      detects such inconsistent state:
      
         abort: REV is not an ancestor of working directory
         (update to REV or descendant and run "hg histedit --continue" again)
      
      But this message is incorrect, unless old Mercurial is re-installed,
      because Mercurial 2.7 or later disallows users to update the working
      directory to another revision.
      
      This patch changes the hint message to suggest "hg histedit --abort".
      45c30868
    • Pierre-Yves David's avatar
      repoview: have unfilteredpropertycache using the underlying cache · 97896709
      Pierre-Yves David authored
      A  `unfilteredpropertycache` is a kind of `propertycache` used on `localrepo` to
      unsure it will always be run against unfiltered repo and stored only once.
      
      As the cached value is never stored in the repoview instance, the descriptor
      will always be called. Before this patch such calls always result in a call to
      the `__get__` method of the `propertycache` on the unfiltered repo. That was
      recomputing a new value on every access through a repoview.
      
      We can't prevent the repoview's `unfilteredpropertycache` to get called on every
      access. In that case the new code makes a standard attribute access to the
      property. If a value is cached it will be used.
      
      The `propertycache` test file have been augmented with test about this issue.
      97896709
    • Pierre-Yves David's avatar
      repoview: make propertycache.setcache compatible with repoview · a1237a4b
      Pierre-Yves David authored
      Propertycache used standard attribute assignment. In the repoview case, this
      assignment was forwarded to the unfiltered repo. This result in:
      (1) unfiltered repo got a potentially wrong cache value,
      (2) repoview never reused the cached value.
      
      This patch replaces the standard attribute assignment by an assignment to
      `objc.__dict__` which will bypass the `repoview.__setattr__`. This will not
      affects other `propertycache` users and it is actually closer to the semantic we
      need.
      
      The interaction of `propertycache` and `repoview` are now tested in a python
      test file.
      a1237a4b
  4. Oct 01, 2013
  5. Sep 30, 2013
  6. Sep 06, 2013
  7. Sep 30, 2013
  8. Sep 24, 2013
  9. Sep 28, 2013
  10. Sep 26, 2013
  11. Sep 25, 2013
Loading