Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hg-pull-mirror-test2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
heptapod
Testing Projects
hg-pull-mirror-test2
Commits
8913e131
Commit
8913e131
authored
19 years ago
by
mpm
Browse files
Options
Downloads
Patches
Plain Diff
Remove python version of the patches code
parent
0f6c4913
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
mercurial/mdiff.py
+1
-80
1 addition, 80 deletions
mercurial/mdiff.py
with
1 addition
and
80 deletions
mercurial/mdiff.py
+
1
−
80
View file @
8913e131
#!/usr/bin/python
import
difflib
,
struct
,
mmap
devzero
=
file
(
"
/dev/zero
"
)
import
difflib
,
struct
,
mmap
,
mpatchs
def
unidiff
(
a
,
ad
,
b
,
bd
,
fn
):
if
not
a
and
not
b
:
return
""
...
...
@@ -63,76 +61,5 @@
pos
+=
l
return
""
.
join
(
t
)
# This attempts to apply a series of patches in time proportional to
# the total size of the patches, rather than patches * len(text). This
# means rather than shuffling strings around, we shuffle around
# pointers to fragments with fragment lists.
#
# When the fragment lists get too long, we collapse them. To do this
# efficiently, we do all our operations inside a buffer created by
# mmap and simply use memmove. This avoids creating a bunch of large
# temporary string buffers.
def
patches
(
a
,
bins
):
if
not
bins
:
return
a
plens
=
[
len
(
x
)
for
x
in
bins
]
pl
=
sum
(
plens
)
bl
=
len
(
a
)
+
pl
tl
=
bl
+
bl
+
pl
# enough for the patches and two working texts
b1
,
b2
=
0
,
bl
if
not
tl
:
return
a
m
=
mmap
.
mmap
(
devzero
.
fileno
(),
tl
,
mmap
.
MAP_PRIVATE
)
# load our original text
m
.
write
(
a
)
frags
=
[(
len
(
a
),
b1
)]
# copy all the patches into our segment so we can memmove from them
pos
=
b2
+
bl
m
.
seek
(
pos
)
for
p
in
bins
:
m
.
write
(
p
)
def
pull
(
dst
,
src
,
l
):
# pull l bytes from src
while
l
:
f
=
src
.
pop
(
0
)
if
f
[
0
]
>
l
:
# do we need to split?
src
.
insert
(
0
,
(
f
[
0
]
-
l
,
f
[
1
]
+
l
))
dst
.
append
((
l
,
f
[
1
]))
return
dst
.
append
(
f
)
l
-=
f
[
0
]
def
collect
(
buf
,
list
):
start
=
buf
for
l
,
p
in
list
:
m
.
move
(
buf
,
p
,
l
)
buf
+=
l
return
(
buf
-
start
,
start
)
for
plen
in
plens
:
# if our list gets too long, execute it
if
len
(
frags
)
>
128
:
b2
,
b1
=
b1
,
b2
frags
=
[
collect
(
b1
,
frags
)]
new
=
[]
end
=
pos
+
plen
last
=
0
while
pos
<
end
:
p1
,
p2
,
l
=
struct
.
unpack
(
"
>lll
"
,
m
[
pos
:
pos
+
12
])
pull
(
new
,
frags
,
p1
-
last
)
# what didn't change
pull
([],
frags
,
p2
-
p1
)
# what got deleted
new
.
append
((
l
,
pos
+
12
))
# what got added
pos
+=
l
+
12
last
=
p2
frags
=
new
+
frags
# what was left at the end
t
=
collect
(
b2
,
frags
)
return
m
[
t
[
1
]:
t
[
1
]
+
t
[
0
]]
def
patch
(
a
,
bin
):
return
patches
(
a
,
[
bin
])
...
...
@@ -137,8 +64,2 @@
def
patch
(
a
,
bin
):
return
patches
(
a
,
[
bin
])
try
:
import
mpatch
patches
=
mpatch
.
patches
except
:
pass
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment