repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Removed ancient and unused code to find the last imported revision from previous...
2007-05-17
Simon Hau
s
mann
Removed ancient and unused code
to find the last imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausma
n
n
Remov
e
d cleantags command
.
It
does
n
't have an
y
meanin
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon Hausman
n
Clean u
p
code duplication for revision parsing and
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
S
imon Ha
u
smann
Al
w
ays pass a sha1 for the initial parent so that
g
it
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
F
ixin
g
s
yncing (gitdir disc
o
very
/
cd) for bare repositories
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
A l
i
ttle todo note
b
efo
r
e I forget
it :),
ba
s
e
d
on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simo
n
Hausmann
Fix cal
l
ing git-p4 rebase from
with
i
n a subdi
r
e
ctor
y
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Give
a
bett
e
r h
i
nt if
g
i
t-p4
su
b
mit fail
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Added the possibility of skip
p
ing
patch
e
s
d
urin
g
git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
S
imon Hausmann
Make
git-
p
4
wo
r
k with
b
are reposito
r
i
es
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n Hausmann
Fix git-p
4
clone //depot/p
r
oject
(head import)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Ha
u
sm
a
n
n
Co
n
verted
to unix newlines
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hau
s
mann
Make submitting wo
r
k
on Windows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
u
s
mann
Make s
u
re
a
ll popen cal
l
s use
binary mode (
f
o
r
Wi
n
dows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Added a l
i
tt
l
e
.
bat wrapper from Marius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Us
e
th
e
subprocess mo
d
ule instead of popen2 to
m
ake
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon Hausmann
Document some imple
m
en
t
ation details, f
o
r the cur
i
ous
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
i
mon
H
a
us
m
an
n
Clea
n
up, removed
t
he old tagging code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Sim
o
n Ha
u
smann
c
l
eanup,
r
e
named s
e
l
f
.
globalP
r
efix to s
e
lf
.
depotPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausma
n
n
Micr
o
clean
u
p
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
i
mon Hausmann
Doc c
l
eanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Sim
o
n
Hausman
n
Ha
n
d
l
e patc
h
er
r
ors in g
i
t-p4
submit bett
e
r
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
A
n
e
w
attempt
a
t
fix
i
ng the
c
h
ild
-
f
a
s
t-import-process
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
m
on H
a
u
s
mann
Slightly imp
r
oved formatt
i
ng
of t
h
e raw
_
input questions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Removed the old patch apply code from
g
i
t-p4 sub
m
i
t
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
S
i
mon Hausma
n
n
F
i
x
the timez
o
ne formatting
.
Now
qgit
a
lso
di
s
play
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Simon Ha
u
smann
Print a
n
error
m
essa
g
e of
som
e
sort if git fast-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simo
n
Hausma
n
n
Allow fo
r
con
v
enient rebasing after
git-p4 sub
m
i
t
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Added a sim
p
le examp
l
e of
u
sage to th
e
"docum
e
ntation" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on Hausmann
fi
x
variable us
a
ge
(
oops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on Hausma
n
n
Fix f
i
le determinat
i
on for #he
a
d imp
o
rts
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
mon Hausmann
Added git-
p
4 clone conven
i
e
n
ce comm
a
nd
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Honor -
-
silent for labels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausma
n
n
Turn off potentiall
y
slow label
d
etection by
de
f
ault
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
Provide a
tree summ
a
ry
af
t
er
g
i
t-p4 reba
s
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
Added git-p
4
rebase convenience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
C
le
a
n up
python class
n
a
mes
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Sim
o
n Hau
s
man
n
Fix "compilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hau
s
mann
F
ix the do
c
s
f
or git-
p
4 submit and
t
urn
git
-
p4 sub
m
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Si
m
on Hausm
a
n
n
Fix
variable usage in tag
i
mpor
t
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hau
s
m
a
nn
Added suppo
r
t for m
a
pping p4 labels to git tag
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Ha
u
smann
git-p4 deb
u
g does
n
't
n
eed a git repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon
H
a
usmann
Don'
t
t
ry t
o
pa
r
s
e
any o
p
tio
n
s
with git-p4
d
ebug b
u
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Prefer
git comm
a
nd
o
v
er git-c
o
mmand
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
i
m
o
n
Hau
s
mann
Minor cosme
t
ic fixlet for the git-p
4
s
u
bmit sync
q
u
e
stion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
Ha
u
smann
Differ
e
nt versions of p4 have
d
ifferent output for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use the new
incr
e
mental import style by default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
S
i
mon Hausmann
Make
it
possible to run
g
it-p4 submit from within the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Hausmann
Br
a
n
d
new smart incremental import
t
hat doesn't ne
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausma
n
n
S
e
t th
e
de
f
a
ult br
a
nch
in run
,
not i
n
the const
r
uctor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
a
usmann
Helper function t
o
check the exi
s
tance of a re
v
ision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausm
a
nn
Added s
o
me helper function(s) to parse th
e
dep
o
t p
a
th
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hau
s
mann
Changed the
d
efaul
t
branch for im
p
orts f
r
om "mas
t
e
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hau
s
mann
Changed the format o
f
t
h
e imported log mes
s
age s
l
ightl
y
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausman
n
R
emoved the
.
p
y exten
s
i
on from git-p4 as it's annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
m
on Hausmann
D
on't show the
submi
t
t
empl
a
te
a
nd the diff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Ma
k
e it possib
l
e to invoke git-p4 f
r
om within subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Made --a
p
ply-as-
p
atch the default for
g
it-p4 su
b
m
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mo
n
Hausmann
Fi
x
su
p
port for d
e
letion
s
in
g
it-p4 submit
when using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
Hausmann
Added
experimental
but sup
e
r-fa
s
t --apply-as-patc
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausmann
Documentation
e
nh
a
ncem
e
nts
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mon Hausmann
Sta
r
t of the git-p4 do
c
umentati
o
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Ha
u
smann
R
emov
e
d p4-fast-export and p4
-
git-sync as they'
v
e
been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
imon
H
ausma
n
n
F
i
x
e
d the initial version
import
b
y
g
etting the fi
l
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
imon Hau
s
mann
Adde
d
m
i
ssing
"
self"s to make the scr
i
pt evalu
a
te
c
orre
c
t
l
y
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Completely u
n
tested "merge"
o
f p4-fast-
e
xp
o
rt
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Haus
m
ann
sync-to-perforc
e
is
now called
s
ubmi
t
and
fixe
d
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Si
m
on
H
aus
m
ann
Part of the code
is
c
opyright by Trolltech
ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausma
n
n
First (un
t
este
d
) attempt at mi
g
rating p4-git-sync
i
n
to
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Provi
d
e a litt
l
e bit of help description for the
git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Start
movin
g
t
he git-p4 tools int
o
one si
n
gle s
c
ript
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
im
o
n Haus
m
a
n
n
Pass t
h
e right nu
m
b
e
r
of argume
n
t
s to comm
i
t, fi
x
es
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
ausmann
Im
p
roved the
g
i
t
dir detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon
H
aus
m
ann
D
e
f
au
l
t to intera
c
t
ive
syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon
Hausmann
Use p4 re
v
e
r
t
.
.
.
instea
d
of revert -a
.
.
.
after sub
m
i
t
ting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Sim
o
n Hausm
a
nn
Auto-detect the current gi
t
branch before
s
ubmi
t
ting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Sim
o
n H
a
u
s
ma
n
n
Ignore
A
pple resource files when i
m
porting from per
f
orce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hausmann
Be ni
c
e an
d
use /usr/bin/env py
t
h
o
n for the
git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Automat
i
cally opera
t
e on a te
m
po
r
a
ry br
a
nch, n
e
ede
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
on Ha
u
sman
n
Lots o
f
bugfixe
s
to
p
4
-g
i
t-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon Hausmann
Fix git-dir
o
ption
and allow readi
n
g
log substi
t
utions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
S
imon Hausmann
F
i
rst ve
r
sion
of a new
s
crip
t
to submit changes back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Split up the cache commandline option
s
into
(
c
ommand
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
a
u
sman
n
R
e
duce the number of false "merges" b
y
s
kippin
g
"branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More work o
n
br
a
nch detection by im
p
lementing changeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausman
n
More co
d
e cleanups
a
nd preparations
f
or more bra
n
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Ha
u
smann
Minor
code
cl
e
anups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Make
t
he
p
4 dat
a
/command cache c
o
nf
i
gur
a
ble through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausma
n
n
Fi
x
ed p4
-
debug file exten
s
ion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
S
i
m
on Hausm
a
nn
Changed --known-
b
ranche
s
to take a file as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
S
i
mo
n
Hausmann
Work in pr
o
gr
e
ss on detec
t
ing branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
S
i
mon H
a
usmann
Adjust the o
u
tput pa
r
si
n
g o
f
git name-rev to handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Don't print a pla
i
n newline
at
th
e
e
nd of the execution
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
M
o
re w
o
rk in
--silent support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Sim
o
n Ha
u
s
man
n
Added suppo
r
t for --si
l
ent
so t
h
at p4-fast-export
ca
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Si
m
on Hausmann
Adde
d
p4
d
elete behav
i
oural emulation as
todo
i
tem
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Ha
u
smann
F
ix single-branch imports
b
y skippi
n
g the bra
n
ch/mer
g
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
S
imon
H
a
u
smann
Use sets
.
Set() ins
t
e
a
d
o
f set() to run also with older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausmann
M
ake
it
possible
to specify
t
h
e p4 cha
n
ges to impo
r
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n Hausmann
When tryi
n
g to m
a
p p
4
integrations
to git merges just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next