repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
diffcore-rename: compute basenames of source and dest candidates
2021-02-16
Elijah Newren
diffcore-rename: co
m
p
ute basena
m
es of source and dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elij
a
h
N
e
wren
t4001: a
d
d
a test compar
i
ng basename si
m
i
l
arity and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elija
h
Newren
di
f
fcore-rename: filt
e
r rename_src list wh
e
n possib
l
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-12
Elijah Newren
diffco
r
e
-
re
n
ame:
no point trying to find a
match bette
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
E
lijah Newren
m
e
rge-ort: begin performance work; instrument wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
Elijah N
e
wre
n
merge
-
ort: ignore the di
r
ectory rename
split conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
E
lijah Newren
merge-ort: fi
x
ma
s
si
v
e
le
a
k
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-
o
rt: fix a directory
rename detection
b
ug
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
l
ijah Newren
merge
-
or
t
: proces
s
_renam
e
s
() now needs mo
r
e de
f
ensi
v
e
ness
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
El
i
jah Newr
e
n
merge-o
r
t
:
implement appl
y
_dire
c
to
r
y
_rename_modif
i
cations()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elij
a
h
Newre
n
merge-ort: add
a
new toplevel_dir field
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
l
ijah Ne
w
ren
m
e
rge-ort
:
implement handle_path_le
v
el_con
f
licts(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elija
h
Newren
merge-ort: implement check
_
f
or_
d
ir
e
c
tory
_
rena
m
e()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah
N
ewren
merge-ort
:
imp
l
ement ap
p
ly_dir_rename() an
d
c
hec
k
_dir_renamed()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Eli
j
a
h Newren
merge-ort
:
implement
c
o
m
pute_collisions()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
me
r
ge-or
t
: modify collect_renames() for
dir
e
ctory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Eli
j
ah Newren
merge-ort: imp
l
e
m
ent han
d
le_di
r
ec
t
ory_lev
e
l_conf
l
i
cts()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge
-
ort
:
impleme
n
t compu
t
e
_
rena
m
e_counts
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: copy get_renamed_dir_por
t
ion() f
r
om mer
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
li
j
ah Newren
merge-ort: ad
d
outline of get_provis
i
onal_
d
irecto
r
y_
r
ename
s
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Eli
j
ah Newren
merge-ort: add outlin
e
for computing directory rena
m
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Eli
j
ah New
r
en
merge-or
t
:
collect whi
c
h
dire
c
tories
a
re remo
v
ed in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Eli
j
ah Ne
w
ren
m
e
rge
-
ort
:
initiali
z
e and free new directory renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
El
i
jah
New
r
en
m
e
rge-ort: add new data structures for directory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Eli
j
ah Newren
diffcore
-
rename: remove
unnec
e
ssary d
u
plic
a
te entr
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Eli
j
ah New
r
en
merg
e
-ort
:
add handling for di
f
ferent types
of
f
iles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
merge-or
t
: copy
f
in
d
_firs
t
_m
e
rge
s
()
i
mple
m
entation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Eli
j
ah Newren
merge-ort: implement format_commit()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Eli
j
ah Ne
w
ren
merge-ort: c
o
py and a
d
a
p
t
merge_
s
ubmodule()
fr
o
m merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
El
i
jah
N
e
wren
merge-ort: co
p
y and ad
a
pt
m
erge_3way() from merge-recursive
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Eli
j
ah
Newren
merge-ort: fle
s
h out implementation of handle_content
_
m
erge
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elij
a
h
N
ewren
merge
-
ort:
h
andle boo
k
-keepin
g
around two- and
three
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah
Newren
m
e
rge-o
r
t: implemen
t
unique_path(
)
hel
p
er
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah
Newre
n
m
erge
-
ort: handle
dir
e
ctory/file confli
c
t
s that rema
i
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
merge
-
ort: handl
e
D
/F
conflict
w
h
ere directory disappears
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Newren
merge-ort:
implement merge_incore_recursi
v
e(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
El
i
jah Ne
w
ren
merge-ort: m
a
ke
clear
_
i
n
ternal_o
p
t
s() aware
of partial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
E
l
ija
h
Newr
e
n
merge-ort: cop
y
a
f
ew s
m
all
helper functions from me
r
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
E
lija
h
N
e
wren
co
m
mit: move reverse_commit_list() fr
o
m
merg
e
-recursive
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
E
l
ijah N
e
wren
merge-ort: add
i
m
p
l
e
mentation of type-change
d
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newren
merge
-
o
rt: add im
p
lementation of nor
m
al renam
e
handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elija
h
Newren
merge-ort: add implementation of rena
m
e collisions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah
Newr
e
n
me
r
ge
-
ort
:
add impl
e
me
n
t
ation of rename/de
l
ete co
n
fl
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newren
merge-ort: add
impleme
n
t
a
tion
o
f both sides renamin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newr
e
n
m
erge-ort: add implementation of bot
h
sides renaming
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Eli
j
ah
New
r
e
n
di
f
fcore-re
n
ame: accelerate r
e
name_dst setup
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elija
h
Ne
w
ren
diffcor
e
-r
e
n
a
m
e
:
simplif
y
and acc
e
lerate register_rename_src()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
t
40
5
8
:
e
xplor
e
du
p
l
ic
a
te tree en
t
ry hand
l
ing in a
bit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah
Newren
t4
0
58: add more tests and
documentation for duplicate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elija
h
N
e
wren
d
i
ff
c
ore-r
e
name: red
u
ce jumpines
s
in progress counters
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elija
h
Newren
diffcore-re
n
ame: simplify
limit
check
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elija
h
Newre
n
diffco
r
e-rename:
a
void
usage of glob
a
l in too_many_r
e
name_ca
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
E
l
ijah Newren
d
iffc
o
re-rena
m
e
:
r
e
name num_crea
t
e to num
_
destin
a
tions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
merge-ort: add
b
asic
o
u
t
line for process_
r
enames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
m
e
rge-ort
:
impleme
n
t co
m
pare_pairs() an
d
collect_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah
N
ewren
merg
e
-ort: implement
d
etect_regular_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
merge-or
t
: add initial outlin
e
fo
r
basic
r
ename detecti
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Ne
w
r
e
n
merg
e
-
o
rt: add basic da
t
a st
r
uctures f
o
r handling r
e
names
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: ad
d
modify
/
del
e
t
e ha
n
dling
a
nd delay
e
d output
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
a
h
N
e
wren
m
e
rge-o
r
t: add die-not-impl
e
mented stub handle_co
n
tent_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah New
r
e
n
merge-o
r
t: add function grouping comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
merge-o
r
t: add a paths_to_f
r
ee fi
e
l
d to mer
g
e
_opti
o
ns_
i
nterna
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newr
e
n
merge-o
r
t: add
a
p
ath_conflict field to merge_options_
i
nt
e
rnal
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add a clear_in
t
e
r
nal_opts helper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah New
r
e
n
m
e
rge-ort:
a
dd
a
f
ew includ
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah New
r
e
n
m
er
g
e
-ort
:
fre
e
dat
a
stru
c
tures i
n
merge
_
f
in
a
lize()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah Ne
w
r
en
merge
-
ort: add implementation o
f
rec
o
rd_c
o
nfl
i
cted_index
_
ent
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah New
r
en
tree:
e
n
a
b
le cmp_cache_name_comp
a
re() to be
used elsew
h
ere
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add implementation o
f
c
heckout()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah Newren
merge
-
or
t
:
basic
o
utline fo
r
mer
g
e_swit
c
h_to_result()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah New
r
e
n
merge-or
t
: step 3
o
f
tr
e
e
w
riting -
-
h
a
ndling subdire
c
tori
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewren
merge-ort: step 2 of tree writin
g
-- function to create
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewre
n
m
e
rge-ort: step 1 of tr
e
e writi
n
g --
record
basenames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: ha
v
e
proc
e
ss_entries opera
t
e i
n
a defin
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah Newren
merg
e
-ort:
a
d
d
a
p
r
e
liminary s
i
mp
l
e process
_
entries
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah Newre
n
merge-o
r
t
:
a
v
o
id recursing into identical trees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Ne
w
ren
merge-or
t
: record stage
a
nd auxi
l
iary info for every
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-o
r
t: compu
t
e
a
few
m
ore useful fields for collect_merg
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
j
ah
Newren
merg
e
-
ort: avoid repeating fill_tree_descr
i
ptor() on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h
Ne
w
ren
m
erge-ort: impleme
n
t a
very basic collect
_
me
r
ge_info()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
merge-ort:
add an err() func
t
ion sim
i
lar to one from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
i
jah Newren
merg
e
-
o
rt: use histog
r
am diff
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: port merge_start() from m
e
rge-recursi
v
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
e
rge-ort: add
s
om
e
hig
h
-level al
g
o
r
i
t
hm structure
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newre
n
merge-ort:
setup basic
i
nternal data struc
t
ure
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Elija
h
N
ewren
stash: fi
x
stash app
l
icati
o
n
in sparse-ch
e
cko
u
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Elijah Newren
stash: remo
v
e unnecessa
r
y proce
s
s for
k
in
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
E
l
ij
a
h N
e
w
r
en
t
7012: add a testca
s
e
demonstr
a
ting stash apply bugs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah New
r
en
short
l
og:
u
se
s
trset from strma
p
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newren
Use new HASHMAP_INIT macro to simplify hashmap initialization
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elij
a
h New
r
en
strmap: take adva
n
tage o
f
FLEXPTR_A
L
LOC
_
STR when re
l
evant
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elij
a
h
N
ew
r
en
s
trmap:
e
n
able allocations to come
from a
m
em_pool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-06
E
l
i
jah Newren
str
m
ap: add
a strset s
u
b
-
type
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-06
Elijah Ne
w
ren
strmap: split create_
e
ntry() out of str
m
ap_put()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
Elij
a
h Newr
e
n
strmap: ad
d
functions facil
i
tatin
g
use as a string
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah N
e
w
r
en
s
t
r
map: enable faster clea
r
ing
a
nd reusin
g
of str
m
aps
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah Newr
e
n
strma
p
: add more uti
l
i
ty functions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-03
Elijah Newren
merge,rebase,rev
e
rt: sel
e
ct ort
o
r recursi
v
e
by config
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Elij
a
h New
r
e
n
strmap: new utility fu
n
c
t
ion
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newr
e
n
hashmap: provid
e
dealloc
a
tion function nam
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next