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: filter rename_src list when possible
2021-02-16
Elijah Newren
di
f
f
c
o
re-rename:
f
ilter rename_src list
w
hen
p
ossible
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-12
Elijah
N
e
w
ren
diffco
r
e-ren
a
me: no point trying to
f
i
nd a m
a
tch bett
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
El
i
jah
N
ewren
merg
e
-ort: begi
n
performa
n
c
e
wo
r
k;
i
nstrum
e
n
t
wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
Elija
h
Newren
mer
g
e-ort: ignor
e
the directory
r
ename
split conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
Elij
a
h Newren
merge-ort: fix massive leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah
N
ewren
merge-o
r
t:
f
i
x a directory
rename detection bug
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
lijah
N
ewren
merge-ort: p
r
ocess_
r
enames() now needs more defens
i
veness
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
l
ijah Ne
w
ren
merge-ort:
im
p
lement
apply
_
dire
c
tory_ren
a
me_modifi
c
ations()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
l
ijah Newren
merge-ort: add a new
t
oplev
e
l_
d
ir field
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah New
r
en
merge-ort: implem
e
nt handle_path_level_confli
c
ts()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elija
h
Newren
merge-ort: im
p
l
eme
n
t che
c
k_for_directory_rename()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-o
r
t:
impleme
n
t
a
pply_dir_rename() an
d
che
c
k_dir_
r
enamed()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: impl
e
ment compute_col
l
isions()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
lijah Newre
n
m
erge-ort:
m
odify collec
t
_r
e
n
a
me
s
()
f
or
directory renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah
N
e
w
ren
merge-ort:
i
mpleme
n
t hand
l
e_directory_l
e
vel_conflicts
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newre
n
m
e
rge-ort
:
implement compute_rename_counts()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-or
t
: c
o
p
y
g
et_r
e
named_dir_
p
orti
o
n() f
r
om merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-o
r
t: ad
d
outline of get_provisional_direct
o
ry_ren
a
mes()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
lijah Newren
me
r
ge-ort: add o
u
tline
for computing directo
r
y re
n
am
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Elijah Newren
merge-ort: collect w
h
ich directorie
s
ar
e
r
e
moved in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Elijah
Newre
n
merge-ort: initializ
e
a
n
d free new directory renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Elij
a
h
N
ewren
merge-ort
:
ad
d
new d
a
ta structures for director
y
renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah
N
ewre
n
diffcore-
r
e
name:
remove unnece
s
sary d
u
plicate ent
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
El
i
jah Newren
m
er
g
e-o
r
t: add handling fo
r
d
i
f
f
e
rent ty
p
es of files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
me
r
g
e
-ort:
copy find_fir
s
t
_merges() implementati
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
El
i
ja
h
Newren
merge-ort: implem
e
nt format_
c
ommit()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
m
e
rge-ort:
co
p
y and
adap
t
merge_submodule() from m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah N
e
wr
e
n
merge-ort: cop
y
and a
d
apt merge_3way()
f
rom
mer
g
e-
r
ecursive
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newr
e
n
merge-o
r
t
: fles
h
o
ut implementation of handl
e
_c
o
nt
e
nt
_
merge()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
El
i
jah Newr
e
n
m
e
rge-ort: handle book-keeping
a
r
o
und two- and t
h
ree
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
El
i
jah Newren
merge-ort: i
m
plement unique_path()
h
elper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Eli
j
ah Newre
n
merge-ort: handle directory/file
c
onflicts that
r
ema
i
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
E
l
ijah Newren
merge-ort: handle D/F conflict where direc
t
ory disappears
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Newren
merge-ort: imp
l
e
m
ent
m
e
rge_incore
_
rec
u
rsive()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Newren
m
e
rge-ort: make
clear_internal_opts()
a
w
are of pa
r
tial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
E
l
ijah Newr
e
n
m
e
rge
-
ort: copy a few
s
mall hel
p
er func
t
i
o
ns fr
o
m me
r
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Elij
a
h Newren
commit: move reverse
_
c
ommit_li
s
t() from merge-recursive
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
El
i
j
ah
Newren
m
e
rge-ort:
a
dd implementatio
n
of
type-chang
e
d rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newren
merge-ort: add
i
mp
l
ementa
t
ion
of normal renam
e
h
a
ndli
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
E
l
ijah Ne
w
ren
merge-
o
rt
:
add implem
e
ntati
o
n
of rena
m
e
c
olli
s
ions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newren
m
erge
-
ort: add implemen
t
ation of rename
/
delete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newren
me
r
g
e
-ort:
a
dd i
m
pleme
n
tation of
b
oth sid
e
s renaming
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newren
merge-ort: add
i
m
plementation
of b
o
th sides
renaming
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah N
e
w
r
en
dif
f
core-
r
enam
e
: accele
r
a
t
e r
e
name_dst s
e
tup
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
El
i
ja
h
N
ewren
d
i
ffcore-rena
m
e
:
simplif
y
a
nd a
c
cel
e
rate r
e
gister_ren
a
me_src()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Ne
w
ren
t4058
:
expl
o
re duplicate tree ent
r
y handling i
n
a bit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah
N
ewren
t4058: a
d
d more tests
and do
c
u
m
entation for
duplicat
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Eli
j
ah Newr
e
n
di
f
fcore-
r
ena
m
e
: redu
c
e jumpiness in progress counters
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
diffcore-rena
m
e: simp
l
ify l
i
mit ch
e
ck
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
d
i
ffcore-ren
a
me
:
av
o
id u
s
age
o
f
globa
l
in t
o
o_man
y
_rename
_
ca
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah
N
ewren
di
f
fco
r
e-r
e
n
ame: ren
a
m
e
num
_
create to
n
u
m_destinations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elij
a
h
N
e
w
ren
m
erg
e
-ort: add bas
i
c outline for process_
r
enames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
merge-ort: implement compare_
p
a
irs() and collect_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elija
h
Newren
merge-ort: impl
e
ment de
t
ect_regular_re
n
ames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
E
l
ij
a
h Newren
mer
g
e-
o
rt: add
initial
outline for b
a
s
ic rename detection
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Eli
j
ah
Newren
mer
g
e-ort: add b
a
sic data structures for handlin
g
renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newre
n
mer
g
e-ort: add modify/de
l
ete handling
a
nd delayed o
u
tp
u
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah Newren
m
e
r
g
e-ort: add di
e
-not-implem
e
n
t
ed stub handle_content_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add functio
n
grouping
comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newr
e
n
merge-
o
r
t: add
a paths_to_free
f
ield t
o
merge_
o
ptions_
i
n
t
e
r
nal
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add a path_co
n
flict
f
ield to
m
erge_options
_
internal
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
mer
g
e-ort: add a clear_
i
nternal_opts helper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newr
e
n
merge-ort: add
a few
i
ncludes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newre
n
merge-ort:
free data stru
c
tures i
n
mer
g
e_finalize()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah Newren
merge-o
r
t: add i
m
ple
m
entat
i
o
n of reco
r
d_co
n
flic
t
ed_in
d
ex_ent
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
tree:
enab
l
e
c
m
p_cache_name_compare() t
o
be used elsewhere
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h
N
ewren
merge-ort: ad
d
imp
l
emen
t
ation of
c
he
c
kout()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewren
merge-or
t
:
b
a
sic outline for merge_swi
t
ch_to_result()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah Newren
merge-ort: step
3
o
f
tree writi
n
g --
hand
l
ing subdirecto
r
i
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-
o
rt: step 2 of tree writing -
-
f
unction
to create
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
me
r
ge-o
r
t: ste
p
1 of t
r
ee writing -- record basenames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
e
r
ge
-
ort
:
have p
r
oc
e
ss_entries operate in a
d
e
f
ined
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewren
merge-ort: add a pr
e
liminary
s
imple process_entries
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewren
merge
-
ort: avoid recu
r
sing into id
e
ntical t
r
e
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h
Newren
merge-ort
:
record stage and auxiliary info for every
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
e
w
ren
merge-
o
rt: c
o
mpute a few mo
r
e
u
s
eful fields for
collect_m
e
rg
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Newren
m
erge-ort: avoid r
e
peating
fill_tr
e
e_
d
escriptor(
)
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
i
j
ah Newren
m
e
rge
-
ort:
implem
e
nt
a very basic
colle
c
t_mer
g
e_info(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah New
r
en
m
e
r
ge-ort
:
a
d
d
an err
(
)
fun
c
tion simil
a
r
to one from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
me
r
g
e
-ort: us
e
h
i
stogr
a
m
diff
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newre
n
m
e
r
ge-ort: port
m
erge_sta
r
t
() from merge-r
e
cu
r
s
ive
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-o
r
t: add
s
ome high-level
a
l
g
orithm st
r
ucture
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Ne
w
ren
merg
e
-o
r
t: setup bas
i
c in
t
ernal da
t
a structu
r
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
E
l
ijah Newren
sta
s
h: fix stas
h
app
l
ication in
sparse-
c
he
c
kouts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Elijah Newren
stash: rem
o
ve unnecessary process fo
r
king
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Eli
j
ah N
e
w
r
en
t7012:
a
d
d a te
s
t
case de
m
on
s
trating
stash appl
y
bugs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elij
a
h
New
r
en
shortlo
g
: use strset from s
t
rmap
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newren
Use new H
A
SHMA
P
_
I
NIT macro to si
m
plify ha
s
hmap initialization
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
E
lijah Newren
strmap
:
t
a
ke advantage of FL
E
XPTR_ALLOC
_
STR whe
n
relevant
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah New
r
en
str
m
ap:
e
nabl
e
allocations to c
o
me from a mem_pool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-06
Elija
h
Newren
s
trmap:
ad
d
a
strs
e
t su
b
-type
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-06
Elijah Newren
strmap: spl
i
t
create_entry
(
)
o
ut of strmap_
p
ut()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah
N
e
w
r
en
strmap: add
f
uncti
o
ns f
a
cilita
t
ing u
s
e as a string
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah New
r
en
strmap: enable faster cl
e
ari
n
g
a
nd r
e
using
of strmaps
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
El
i
jah Ne
w
ren
s
trm
a
p
:
a
dd m
o
re utility
f
unctions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-03
Elijah Newren
me
r
g
e,
r
e
b
as
e
,rev
e
rt:
select ort or recurs
i
ve
by config
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah
N
ewren
strmap: new utili
t
y
functions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
El
i
jah Newren
hashmap: provide deal
l
ocati
o
n
func
t
ion names
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
E
lijah N
e
wren
hashmap:
i
ntr
o
du
c
e a
n
ew has
h
map_
p
artial
_
clear()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newren
hashmap: allow re-use after
h
ashmap_free()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next