author | Pulkit Goyal <7895pulkit@gmail.com> |
Thu, 24 May 2018 01:50:26 +0530 | |
branch | stable |
changeset 3767 | 115caa4e5278 |
parent 3701 | 29c413a7dfb5 |
child 3882 | 55b8c7e7e352 |
permissions | -rw-r--r-- |
2525
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 |
# Copyright 2017 Octobus <contact@octobus.net> |
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
# |
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 |
# This software may be used and distributed according to the terms of the |
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 |
# GNU General Public License version 2 or any later version. |
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 |
""" |
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 |
Compatibility module |
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 |
""" |
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 |
|
3499
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
9 |
import inspect |
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
10 |
|
2525
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 |
from mercurial import ( |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
12 |
context, |
3499
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
13 |
mdiff, |
2751
4f560f117fff
compat: use 'safehasattr' over 'hasattr'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2693
diff
changeset
|
14 |
obsolete, |
3693
105d2d2c6a2e
compat: drop obsutile layer
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3692
diff
changeset
|
15 |
obsutil, |
3767
115caa4e5278
evolve: add compat for repair.stripbmrevset which is moved to scmutil
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3701
diff
changeset
|
16 |
repair, |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
17 |
revset, |
3767
115caa4e5278
evolve: add compat for repair.stripbmrevset which is moved to scmutil
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3701
diff
changeset
|
18 |
scmutil, |
2751
4f560f117fff
compat: use 'safehasattr' over 'hasattr'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2693
diff
changeset
|
19 |
util, |
3692
f9988919d69e
compat: drop vfsmod compat layer
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3680
diff
changeset
|
20 |
vfs as vfsmod, |
2525
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 |
) |
3524
6d4095e6bdd3
obsdiscovery: add compatibility layer to register wireproto command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3514
diff
changeset
|
22 |
from mercurial.hgweb import hgweb_mod |
2525
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
23 |
|
3483
f03845bfd015
compat: add wrapper for logcmdutil functions
Yuya Nishihara <yuya@tcha.org>
parents:
3408
diff
changeset
|
24 |
# hg < 4.6 compat (c8e2d6ed1f9e) |
f03845bfd015
compat: add wrapper for logcmdutil functions
Yuya Nishihara <yuya@tcha.org>
parents:
3408
diff
changeset
|
25 |
try: |
f03845bfd015
compat: add wrapper for logcmdutil functions
Yuya Nishihara <yuya@tcha.org>
parents:
3408
diff
changeset
|
26 |
from mercurial import logcmdutil |
f03845bfd015
compat: add wrapper for logcmdutil functions
Yuya Nishihara <yuya@tcha.org>
parents:
3408
diff
changeset
|
27 |
changesetdisplayer = logcmdutil.changesetdisplayer |
f03845bfd015
compat: add wrapper for logcmdutil functions
Yuya Nishihara <yuya@tcha.org>
parents:
3408
diff
changeset
|
28 |
changesetprinter = logcmdutil.changesetprinter |
f03845bfd015
compat: add wrapper for logcmdutil functions
Yuya Nishihara <yuya@tcha.org>
parents:
3408
diff
changeset
|
29 |
displaygraph = logcmdutil.displaygraph |
f03845bfd015
compat: add wrapper for logcmdutil functions
Yuya Nishihara <yuya@tcha.org>
parents:
3408
diff
changeset
|
30 |
except (AttributeError, ImportError): |
f03845bfd015
compat: add wrapper for logcmdutil functions
Yuya Nishihara <yuya@tcha.org>
parents:
3408
diff
changeset
|
31 |
from mercurial import cmdutil |
f03845bfd015
compat: add wrapper for logcmdutil functions
Yuya Nishihara <yuya@tcha.org>
parents:
3408
diff
changeset
|
32 |
changesetdisplayer = cmdutil.show_changeset |
f03845bfd015
compat: add wrapper for logcmdutil functions
Yuya Nishihara <yuya@tcha.org>
parents:
3408
diff
changeset
|
33 |
changesetprinter = cmdutil.changeset_printer |
f03845bfd015
compat: add wrapper for logcmdutil functions
Yuya Nishihara <yuya@tcha.org>
parents:
3408
diff
changeset
|
34 |
displaygraph = cmdutil.displaygraph |
f03845bfd015
compat: add wrapper for logcmdutil functions
Yuya Nishihara <yuya@tcha.org>
parents:
3408
diff
changeset
|
35 |
|
2525
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 |
from . import ( |
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 |
exthelper, |
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 |
) |
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
39 |
|
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
40 |
eh = exthelper.exthelper() |
5adb8bdb935e
compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
41 |
|
3283
039c4b8dc3ed
obsnote: warn if user try to store a note in obsmarker on an older hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3074
diff
changeset
|
42 |
def isobsnotesupported(): |
039c4b8dc3ed
obsnote: warn if user try to store a note in obsmarker on an older hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3074
diff
changeset
|
43 |
# hack to know obsnote is supported. The patches for obsnote support was |
039c4b8dc3ed
obsnote: warn if user try to store a note in obsmarker on an older hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3074
diff
changeset
|
44 |
# pushed before the obsfateprinter patches, so this will serve as a good |
039c4b8dc3ed
obsnote: warn if user try to store a note in obsmarker on an older hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3074
diff
changeset
|
45 |
# check |
039c4b8dc3ed
obsnote: warn if user try to store a note in obsmarker on an older hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3074
diff
changeset
|
46 |
if not obsutil: |
039c4b8dc3ed
obsnote: warn if user try to store a note in obsmarker on an older hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3074
diff
changeset
|
47 |
return False |
039c4b8dc3ed
obsnote: warn if user try to store a note in obsmarker on an older hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3074
diff
changeset
|
48 |
return util.safehasattr(obsutil, 'obsfateprinter') |
039c4b8dc3ed
obsnote: warn if user try to store a note in obsmarker on an older hg
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3074
diff
changeset
|
49 |
|
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
50 |
# Evolution renaming compat |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
51 |
|
2854
66796d7b5415
warning: rename unstable warning message
Boris Feld <boris.feld@octobus.net>
parents:
2849
diff
changeset
|
52 |
TROUBLES = {} |
66796d7b5415
warning: rename unstable warning message
Boris Feld <boris.feld@octobus.net>
parents:
2849
diff
changeset
|
53 |
|
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
54 |
if not util.safehasattr(context.basectx, 'orphan'): |
2854
66796d7b5415
warning: rename unstable warning message
Boris Feld <boris.feld@octobus.net>
parents:
2849
diff
changeset
|
55 |
TROUBLES['ORPHAN'] = 'unstable' |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
56 |
context.basectx.orphan = context.basectx.unstable |
2854
66796d7b5415
warning: rename unstable warning message
Boris Feld <boris.feld@octobus.net>
parents:
2849
diff
changeset
|
57 |
else: |
66796d7b5415
warning: rename unstable warning message
Boris Feld <boris.feld@octobus.net>
parents:
2849
diff
changeset
|
58 |
TROUBLES['ORPHAN'] = 'orphan' |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
59 |
|
2835
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
60 |
if not util.safehasattr(context.basectx, 'contentdivergent'): |
2856
f6517779a7c4
warning: rename warning message
Boris Feld <boris.feld@octobus.net>
parents:
2855
diff
changeset
|
61 |
TROUBLES['CONTENTDIVERGENT'] = 'divergent' |
2835
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
62 |
context.basectx.contentdivergent = context.basectx.divergent |
2856
f6517779a7c4
warning: rename warning message
Boris Feld <boris.feld@octobus.net>
parents:
2855
diff
changeset
|
63 |
else: |
2858
4b934144ed11
messages: use hyphenated '{phase,content}-divergent' in user messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
2856
diff
changeset
|
64 |
TROUBLES['CONTENTDIVERGENT'] = 'content-divergent' |
2835
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
65 |
|
2836
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
66 |
if not util.safehasattr(context.basectx, 'phasedivergent'): |
2855
1db0137297f4
warning: rename bumped warning message
Boris Feld <boris.feld@octobus.net>
parents:
2854
diff
changeset
|
67 |
TROUBLES['PHASEDIVERGENT'] = 'bumped' |
2836
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
68 |
context.basectx.phasedivergent = context.basectx.bumped |
2855
1db0137297f4
warning: rename bumped warning message
Boris Feld <boris.feld@octobus.net>
parents:
2854
diff
changeset
|
69 |
else: |
2858
4b934144ed11
messages: use hyphenated '{phase,content}-divergent' in user messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
2856
diff
changeset
|
70 |
TROUBLES['PHASEDIVERGENT'] = 'phase-divergent' |
2836
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
71 |
|
2839
f9c8c754a528
context: troubled was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2836
diff
changeset
|
72 |
if not util.safehasattr(context.basectx, 'isunstable'): |
f9c8c754a528
context: troubled was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2836
diff
changeset
|
73 |
context.basectx.isunstable = context.basectx.troubled |
f9c8c754a528
context: troubled was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2836
diff
changeset
|
74 |
|
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
75 |
if not util.safehasattr(revset, 'orphan'): |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
76 |
@eh.revset('orphan') |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
77 |
def oprhanrevset(*args, **kwargs): |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
78 |
return revset.unstable(*args, **kwargs) |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
79 |
|
2835
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
80 |
if not util.safehasattr(revset, 'contentdivergent'): |
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
81 |
@eh.revset('contentdivergent') |
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
82 |
def contentdivergentrevset(*args, **kwargs): |
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
83 |
return revset.divergent(*args, **kwargs) |
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
84 |
|
2836
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
85 |
if not util.safehasattr(revset, 'phasedivergent'): |
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
86 |
@eh.revset('phasedivergent') |
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
87 |
def phasedivergentrevset(*args, **kwargs): |
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
88 |
return revset.bumped(*args, **kwargs) |
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
89 |
|
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
90 |
if not util.safehasattr(context.basectx, 'instabilities'): |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
91 |
def instabilities(self): |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
92 |
"""return the list of instabilities affecting this changeset. |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
93 |
|
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
94 |
Instabilities are returned as strings. possible values are: |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
95 |
- orphan, |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
96 |
- phase-divergent, |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
97 |
- content-divergent. |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
98 |
""" |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
99 |
instabilities = [] |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
100 |
if self.orphan(): |
2849
95470e817c00
compat: fix instabilities compat
Boris Feld <boris.feld@octobus.net>
parents:
2847
diff
changeset
|
101 |
instabilities.append('orphan') |
2836
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
102 |
if self.phasedivergent(): |
feaa52680682
log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
2835
diff
changeset
|
103 |
instabilities.append('phase-divergent') |
2835
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
104 |
if self.contentdivergent(): |
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
105 |
instabilities.append('content-divergent') |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
106 |
return instabilities |
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
107 |
|
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2794
diff
changeset
|
108 |
context.basectx.instabilities = instabilities |
2840
dfad30be866c
context: precursors was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2839
diff
changeset
|
109 |
|
dfad30be866c
context: precursors was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2839
diff
changeset
|
110 |
# XXX: Better detection of property cache |
dfad30be866c
context: precursors was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2839
diff
changeset
|
111 |
if 'predecessors' not in dir(obsolete.obsstore): |
dfad30be866c
context: precursors was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2839
diff
changeset
|
112 |
@property |
dfad30be866c
context: precursors was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2839
diff
changeset
|
113 |
def predecessors(self): |
dfad30be866c
context: precursors was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2839
diff
changeset
|
114 |
return self.precursors |
dfad30be866c
context: precursors was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2839
diff
changeset
|
115 |
|
dfad30be866c
context: precursors was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2839
diff
changeset
|
116 |
obsolete.obsstore.predecessors = predecessors |
2845
9fc6a4615ae5
revset: unstable volatile set was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2841
diff
changeset
|
117 |
|
9fc6a4615ae5
revset: unstable volatile set was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2841
diff
changeset
|
118 |
if not util.safehasattr(obsolete, '_computeorphanset'): |
9fc6a4615ae5
revset: unstable volatile set was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2841
diff
changeset
|
119 |
obsolete._computeorphanset = obsolete.cachefor('orphan')(obsolete._computeunstableset) |
2846
9c019996bce0
revset: divergent volatile set was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2845
diff
changeset
|
120 |
|
9c019996bce0
revset: divergent volatile set was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2845
diff
changeset
|
121 |
if not util.safehasattr(obsolete, '_computecontentdivergentset'): |
9c019996bce0
revset: divergent volatile set was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2845
diff
changeset
|
122 |
obsolete._computecontentdivergentset = obsolete.cachefor('contentdivergent')(obsolete._computedivergentset) |
2847
a1805a65ce21
revset: bumped volatile set was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2846
diff
changeset
|
123 |
|
a1805a65ce21
revset: bumped volatile set was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2846
diff
changeset
|
124 |
if not util.safehasattr(obsolete, '_computephasedivergentset'): |
a1805a65ce21
revset: bumped volatile set was deprecated
Boris Feld <boris.feld@octobus.net>
parents:
2846
diff
changeset
|
125 |
obsolete._computephasedivergentset = obsolete.cachefor('phasedivergent')(obsolete._computebumpedset) |
3064
7a1a4d1f0958
pager: add a function in compats to start pager
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2858
diff
changeset
|
126 |
|
3298
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
127 |
def memfilectx(repo, ctx, fctx, flags, copied, path): |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
128 |
# XXX Would it be better at the module level? |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
129 |
varnames = context.memfilectx.__init__.__code__.co_varnames |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
130 |
ctxmandatory = varnames[2] == "changectx" |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
131 |
|
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
132 |
if ctxmandatory: |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
133 |
mctx = context.memfilectx(repo, ctx, fctx.path(), fctx.data(), |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
134 |
islink='l' in flags, |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
135 |
isexec='x' in flags, |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
136 |
copied=copied.get(path)) |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
137 |
else: |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
138 |
mctx = context.memfilectx(repo, fctx.path(), fctx.data(), |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
139 |
islink='l' in flags, |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
140 |
isexec='x' in flags, |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
141 |
copied=copied.get(path)) |
f4b06f44d274
memfilectx: changectx argument is not mandatory
Boris Feld <boris.feld@octobus.net>
parents:
3283
diff
changeset
|
142 |
return mctx |
3408
f4ea9652661d
cachevfs: use a compatibility later for all access
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3298
diff
changeset
|
143 |
|
f4ea9652661d
cachevfs: use a compatibility later for all access
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3298
diff
changeset
|
144 |
def getcachevfs(repo): |
f4ea9652661d
cachevfs: use a compatibility later for all access
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3298
diff
changeset
|
145 |
cachevfs = getattr(repo, 'cachevfs', None) |
f4ea9652661d
cachevfs: use a compatibility later for all access
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3298
diff
changeset
|
146 |
if cachevfs is None: |
f4ea9652661d
cachevfs: use a compatibility later for all access
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3298
diff
changeset
|
147 |
cachevfs = vfsmod.vfs(repo.vfs.join('cache')) |
f4ea9652661d
cachevfs: use a compatibility later for all access
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3298
diff
changeset
|
148 |
cachevfs.createmode = repo.store.createmode |
f4ea9652661d
cachevfs: use a compatibility later for all access
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3298
diff
changeset
|
149 |
return cachevfs |
3499
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
150 |
|
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
151 |
def strdiff(a, b, fn1, fn2): |
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
152 |
""" A version of mdiff.unidiff for comparing two strings |
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
153 |
""" |
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
154 |
args = [a, '', b, '', fn1, fn2] |
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
155 |
|
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
156 |
# hg < 4.6 compat 8b6dd3922f70 |
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
157 |
argspec = inspect.getargspec(mdiff.unidiff) |
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
158 |
|
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
159 |
if 'binary' in argspec.args: |
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
160 |
args.append(False) |
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
161 |
|
512706514555
obsfate: fix changeset description diff computing
Boris Feld <boris.feld@octobus.net>
parents:
3483
diff
changeset
|
162 |
return mdiff.unidiff(*args) |
3514
498f782ccb4b
compat: add compat layer for date related functions
Boris Feld <boris.feld@octobus.net>
parents:
3499
diff
changeset
|
163 |
|
498f782ccb4b
compat: add compat layer for date related functions
Boris Feld <boris.feld@octobus.net>
parents:
3499
diff
changeset
|
164 |
# date related |
498f782ccb4b
compat: add compat layer for date related functions
Boris Feld <boris.feld@octobus.net>
parents:
3499
diff
changeset
|
165 |
|
498f782ccb4b
compat: add compat layer for date related functions
Boris Feld <boris.feld@octobus.net>
parents:
3499
diff
changeset
|
166 |
try: |
498f782ccb4b
compat: add compat layer for date related functions
Boris Feld <boris.feld@octobus.net>
parents:
3499
diff
changeset
|
167 |
import mercurial.utils.dateutil |
498f782ccb4b
compat: add compat layer for date related functions
Boris Feld <boris.feld@octobus.net>
parents:
3499
diff
changeset
|
168 |
makedate = mercurial.utils.dateutil.makedate |
498f782ccb4b
compat: add compat layer for date related functions
Boris Feld <boris.feld@octobus.net>
parents:
3499
diff
changeset
|
169 |
parsedate = mercurial.utils.dateutil.parsedate |
498f782ccb4b
compat: add compat layer for date related functions
Boris Feld <boris.feld@octobus.net>
parents:
3499
diff
changeset
|
170 |
except ImportError as e: |
498f782ccb4b
compat: add compat layer for date related functions
Boris Feld <boris.feld@octobus.net>
parents:
3499
diff
changeset
|
171 |
import mercurial.util |
498f782ccb4b
compat: add compat layer for date related functions
Boris Feld <boris.feld@octobus.net>
parents:
3499
diff
changeset
|
172 |
makedate = mercurial.util.makedate |
498f782ccb4b
compat: add compat layer for date related functions
Boris Feld <boris.feld@octobus.net>
parents:
3499
diff
changeset
|
173 |
parsedate = mercurial.util.parsedate |
3524
6d4095e6bdd3
obsdiscovery: add compatibility layer to register wireproto command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3514
diff
changeset
|
174 |
|
6d4095e6bdd3
obsdiscovery: add compatibility layer to register wireproto command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3514
diff
changeset
|
175 |
def wireprotocommand(exthelper, name, args='', permission='pull'): |
3680
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
176 |
try: |
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
177 |
# Since b4d85bc1 |
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
178 |
from mercurial.wireprotov1server import wireprotocommand |
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
179 |
return wireprotocommand(name, args, permission=permission) |
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
180 |
except (ImportError, AttributeError): |
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
181 |
from mercurial import wireproto |
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
182 |
|
3524
6d4095e6bdd3
obsdiscovery: add compatibility layer to register wireproto command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3514
diff
changeset
|
183 |
if 3 <= len(wireproto.wireprotocommand.func_defaults): |
6d4095e6bdd3
obsdiscovery: add compatibility layer to register wireproto command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3514
diff
changeset
|
184 |
return wireproto.wireprotocommand(name, args, permission=permission) |
6d4095e6bdd3
obsdiscovery: add compatibility layer to register wireproto command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3514
diff
changeset
|
185 |
|
3680
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
186 |
# <= hg-4.5 permission must be registered in dictionnary |
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
187 |
def decorator(func): |
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
188 |
@eh.extsetup |
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
189 |
def install(ui): |
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
190 |
hgweb_mod.perms[name] = permission |
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
191 |
wireproto.commands[name] = (func, args) |
e2a91d4d207d
evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3668
diff
changeset
|
192 |
return decorator |
3616
f6d629514607
compat: use updateresult API if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3575
diff
changeset
|
193 |
|
f6d629514607
compat: use updateresult API if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3575
diff
changeset
|
194 |
# mercurial <= 4.5 do not have the updateresult object |
f6d629514607
compat: use updateresult API if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3575
diff
changeset
|
195 |
try: |
f6d629514607
compat: use updateresult API if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3575
diff
changeset
|
196 |
from mercurial.merge import updateresult |
f6d629514607
compat: use updateresult API if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3575
diff
changeset
|
197 |
except (ImportError, AttributeError): |
f6d629514607
compat: use updateresult API if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3575
diff
changeset
|
198 |
updateresult = None |
f6d629514607
compat: use updateresult API if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3575
diff
changeset
|
199 |
|
3767
115caa4e5278
evolve: add compat for repair.stripbmrevset which is moved to scmutil
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3701
diff
changeset
|
200 |
# 46c2b19a1263f18a5829a21b7a5053019b0c5a31 in hg moved repair.stripbmrevset to |
115caa4e5278
evolve: add compat for repair.stripbmrevset which is moved to scmutil
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3701
diff
changeset
|
201 |
# scmutil.bookmarkrevs |
115caa4e5278
evolve: add compat for repair.stripbmrevset which is moved to scmutil
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3701
diff
changeset
|
202 |
# This change is a part of 4.7 cycle, so drop this when we drop support for 4.6 |
115caa4e5278
evolve: add compat for repair.stripbmrevset which is moved to scmutil
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3701
diff
changeset
|
203 |
try: |
115caa4e5278
evolve: add compat for repair.stripbmrevset which is moved to scmutil
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3701
diff
changeset
|
204 |
bmrevset = repair.stripbmrevset |
115caa4e5278
evolve: add compat for repair.stripbmrevset which is moved to scmutil
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3701
diff
changeset
|
205 |
except AttributeError: |
115caa4e5278
evolve: add compat for repair.stripbmrevset which is moved to scmutil
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3701
diff
changeset
|
206 |
bmrevset = scmutil.bookmarkrevs |
115caa4e5278
evolve: add compat for repair.stripbmrevset which is moved to scmutil
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3701
diff
changeset
|
207 |
|
3616
f6d629514607
compat: use updateresult API if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3575
diff
changeset
|
208 |
def hasconflict(upres): |
f6d629514607
compat: use updateresult API if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3575
diff
changeset
|
209 |
if updateresult is None: |
f6d629514607
compat: use updateresult API if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3575
diff
changeset
|
210 |
return bool(upres[-1]) |
f6d629514607
compat: use updateresult API if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3575
diff
changeset
|
211 |
return bool(upres.unresolvedcount) |